Fix ordering and namespacing in type signature, BREAKING.