fixed routing issue - there were name clashes