Rename the package routes to R (shorter, and fix an issue)
Merge branch 'feature-accesiblesubroute' into 2.1.x