Updated routing to follow base name convention