Issue #2386305 by slashrsm: Standardize entity routes.
Merge pull request #19 from slashrsm/2386305

Standardize entity routes