Make names more specific