Enhancement to remove module name from define declaration for all modules listed in REQUIRE_FIXUP_MODULE_NAMES