fix module naming conventions