#30 - made type names more consistent in m.time