Merge "Renames / tidy ups"