Change naming and fix route creation