Rename some atomic primitives