Update on naming system