Improve module naming.