changed some routes names to match new convention; fixed entity mappings

changed some routes names to match new convention; fixed entity mappings