Modify names and update routing subsystem