Improve module naming scheme