makey things worky by fixing naming and routes