Couple of little renames