Changed names to full-uid and implemented a short-name mechanism