Soft refactoring to add the 'mm' namespace