Merge "Match APEX by module name instead of package name"