Minor naming fixes

Changing a type name for consistency.