fix module name issues