Fixing confusing names