#229: consolidate *nameentry and *name elements

also fixed repository