Fix up module naming conventions

Updated based on your comments.