Various updates, renames, etc.