Refactor routing normalisation to use same factory multiple times, use name defined for factory