minor renames