Get rid of ms_names(); clean up m_names() to be more uniform.