Regularize the uncommitted rename via git mv so the working tree is clean and the authoritative messaging-system spec is unambiguous.
Godopu