Replace reference to MSun with cactusM to generalize