Fix typedefed enums
Fix module name