Rename some operations and operator helpers