Update and rename m to m_unix