User blog comment:MasterBroccoli/Page names (Definitive Edition)/@comment-27274076-20191120111220/@comment-26842175-20191126190415

I think the name changes in DE make sense. The units are probably better described by their DE names.

So I would vote for option 2, not for an ideological point of view but rather for a practical point of view: The new names are better.