Rename properties to mXXXXX