more uniform names