Rename fix part 2