rename fix part 1