fix names, etc in Nebula so ns renaming can be merged