More consistent module naming conventions