Fixing some code style issues and bringing the module names in-line with the rest of the profile.