Minor refactoring

Shortened the names of a few built-in operands.