Shorten the namespace name using an internal namespace.
Reorder mutation parameters to keep things consistent and simplify them.