Fix Inconsistent Naming of Modules
Closes #3