Make the names more regular