Fixing module naming style. Closes #3