Remove builder suffixes for operation classes