New naming scheme and links