New module naming scheme