Rename handlers back to routes