some renaming to make mmse stuff more consistent with the docs