Update & Rename CM.Mk