Reworked name system