More name Fixes

More Matching with MM names