Made change to make sure route name will be unique