Fixed more race conditions in the build system.

If the G__X filenames don't match with a module called X, then
CMake can't find the right dependencies and we get race conditions.
This patch fixes all a few more typos that caused those problems.