Changed route and adjusted for name change