ES-152: Changes in ember resources/routes and names