Issue #2346575 by Nick_vh: Change entity routes to conform to the new standards.

Issue #2346575 by Nick_vh: Change entity routes to conform to the new standards.

Issue #2346575 by Nick_vh: Change entity routes to conform to the new standards.