Normalize API rename part 2