Minor changes, renames