In my changeset 151080599, I have changed a lot of what you remapped here. Just letting you know, that the reason was that I had already remapped it previously to you, I just didn't upload the changeset until after you had submitted your edits.

Sorry for delaying on my changeset upload, as well as not mentioning in the note that I was working on it, and causing this duplicate work.