Expand the naming.cli commands