enum naming fixes