Minor changes and renames