Naming fixes to appease the syntax overlord