Moved name logic to Router