Some renaming for the sake of clarity