Do significant name management surgery
more getname ->getshortname|getfullname changes
conflict repair