Make names more logical