Re-factored submodule names to be capitalized like class objects.