Fixed some module name issues.