making names more logical