cleaning up module naming scheme