Update some naming convention and route error