Rename for logical consistency
Cleanup operator stuff