Changed the rest of the module names.

For convention's sake.