Make names more consistent