diff --git a/assets/src/components/form/select/test/__snapshots__/model-select.js.snap b/assets/src/components/form/select/test/__snapshots__/model-select.js.snap
index 43bd7bbbae0..d051d5826ff 100644
--- a/assets/src/components/form/select/test/__snapshots__/model-select.js.snap
+++ b/assets/src/components/form/select/test/__snapshots__/model-select.js.snap
@@ -1,12 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ModelSelect Snapshot with default options (with required modelName) should render and match snapshot 1`] = `
-<StateManager
-  defaultInputValue=""
-  defaultMenuIsOpen={false}
-  defaultValue={null}
-  isClearable={true}
-  isLoading={true}
-  placeholder="Select..."
-/>
+<React.Fragment>
+  <StateManager
+    defaultInputValue=""
+    defaultMenuIsOpen={false}
+    defaultValue={null}
+    isClearable={true}
+    isLoading={true}
+    name="model-select-1"
+    options={Array []}
+    placeholder="Select..."
+    value={Object {}}
+  />
+</React.Fragment>
 `;
diff --git a/assets/src/components/form/select/test/model-select.js b/assets/src/components/form/select/test/model-select.js
index ece1cb400cc..87fb73f56c9 100644
--- a/assets/src/components/form/select/test/model-select.js
+++ b/assets/src/components/form/select/test/model-select.js
@@ -9,7 +9,7 @@ const simulatedResponse = [
 describe( 'ModelSelect Snapshot with default options (with required modelName)',
 	() => {
 		it( 'should render and match snapshot', () => {
-			const wrapper = shallow( <ModelSelect modelName={ 'events' } /> );
+			const wrapper = shallow( <ModelSelect modelName={ 'event' } /> );
 			expect( wrapper ).toMatchSnapshot();
 		} );
 	},
@@ -19,7 +19,7 @@ describe( 'ModelSelect props check', () => {
 	it( 'should render and have passed in props match expectation', () => {
 		const wrapper = shallow(
 			<ModelSelect
-				modelName={ 'events' }
+				modelName={ 'event' }
 				modelEntities={ simulatedResponse }
 				selectConfiguration={ {
 					isClearable: false,
@@ -27,14 +27,25 @@ describe( 'ModelSelect props check', () => {
 				} }
 			/>,
 		);
-		expect( wrapper.prop( 'options' ) ).toEqual(
+		const selectWrapper = wrapper.childAt( 0 );
+		expect( selectWrapper.prop( 'options' ) ).toEqual(
 			[
 				{ label: 'Event A', value: 1 },
 				{ label: 'Event B', value: 2 },
 			],
 		);
-		expect( wrapper.prop( 'isClearable' ) ).toEqual( false );
-		expect( wrapper.prop( 'isLoading' ) ).toEqual( false );
-		expect( wrapper.prop( 'placeholder' ) ).toEqual( 'Select...' );
+		expect( selectWrapper.prop( 'isClearable' ) ).toEqual( false );
+		expect( selectWrapper.prop( 'isLoading' ) ).toEqual( false );
+		expect( selectWrapper.prop( 'placeholder' ) ).toEqual( 'Select...' );
+	} );
+	it( 'should render a label when selectLabel is provided', () => {
+		const wrapper = shallow(
+			<ModelSelect
+				modelName={ 'event' }
+				modelEntities={ simulatedResponse }
+				selectLabel={ 'Label for Select' }
+			/>
+		);
+		expect( wrapper.childAt(0).text() ).toEqual( 'Label for Select' );
 	} );
 } );
diff --git a/assets/src/data/eventespresso/core/test/reducers.js b/assets/src/data/eventespresso/core/test/reducers.js
index 7ebe92951b0..77d99a88f0e 100644
--- a/assets/src/data/eventespresso/core/test/reducers.js
+++ b/assets/src/data/eventespresso/core/test/reducers.js
@@ -19,23 +19,23 @@ import {
 
 const mockStateForTests = {
 	entities: {
-		events: {
+		event: {
 			10: { EVT_ID: 10, name: 'Event 10' },
 			20: { EVT_ID: 20, name: 'Event 20' },
 			30: { EVT_ID: 30, name: 'Event 30' },
 		},
-		terms: {
+		term: {
 			'10:10': { TERM_ID: 10, TAXONOMY_ID: 10, name: 'Term 10' },
 			'20:20': { TERM_ID: 20, TAXONOMY_ID: 20, name: 'Term 20' },
 		},
 	},
 	entityIds: {
-		events: [ '10', '20', '30' ],
-		terms: [ '10:10', '20:20' ],
+		event: [ '10', '20', '30' ],
+		term: [ '10:10', '20:20' ],
 	},
 	dirty: {
-		events: [ '20' ],
-		terms: [ '20:20' ],
+		event: [ '20' ],
+		term: [ '20:20' ],
 	},
 };
 
@@ -46,7 +46,7 @@ describe( 'receiveEntityRecords()', () => {
 			const state = receiveEntityRecords(
 				originalState,
 				receiveRecordsAction(
-					'tickets',
+					'ticket',
 					[ { TKT_ID: 10, name: 'Ticket 10' } ],
 				),
 			);
@@ -58,7 +58,7 @@ describe( 'receiveEntityRecords()', () => {
 		const state = receiveEntityRecords(
 			originalState,
 			receiveRecordsAction(
-				'events',
+				'event',
 				[ { EVT_ID: 40, name: 'Event 40' } ],
 			),
 		);
@@ -71,30 +71,30 @@ describe( 'receiveEntityRecords()', () => {
 		const state = receiveEntityRecords(
 			originalState,
 			receiveRecordsAction(
-				'events',
+				'event',
 				[ { EVT_ID: 40, name: 'Event 40' } ],
 			),
 		);
 		const expectedState = {
 			entities: {
-				events: {
+				event: {
 					10: { EVT_ID: 10, name: 'Event 10' },
 					20: { EVT_ID: 20, name: 'Event 20' },
 					30: { EVT_ID: 30, name: 'Event 30' },
 					40: { EVT_ID: 40, name: 'Event 40' },
 				},
-				terms: {
+				term: {
 					'10:10': { TERM_ID: 10, TAXONOMY_ID: 10, name: 'Term 10' },
 					'20:20': { TERM_ID: 20, TAXONOMY_ID: 20, name: 'Term 20' },
 				},
 			},
 			entityIds: {
-				events: [ '10', '20', '30', '40' ],
-				terms: [ '10:10', '20:20' ],
+				event: [ '10', '20', '30', '40' ],
+				term: [ '10:10', '20:20' ],
 			},
 			dirty: {
-				events: [ '20' ],
-				terms: [ '20:20' ],
+				event: [ '20' ],
+				term: [ '20:20' ],
 			},
 		};
 
@@ -106,30 +106,30 @@ describe( 'receiveEntityRecords()', () => {
 		const state = receiveEntityRecords(
 			originalState,
 			receiveRecordsAction(
-				'terms',
+				'term',
 				[ { TERM_ID: 20, TAXONOMY_ID: 30, name: 'Term 20' } ],
 			),
 		);
 		const expectedState = {
 			entities: {
-				events: {
+				event: {
 					10: { EVT_ID: 10, name: 'Event 10' },
 					20: { EVT_ID: 20, name: 'Event 20' },
 					30: { EVT_ID: 30, name: 'Event 30' },
 				},
-				terms: {
+				term: {
 					'10:10': { TERM_ID: 10, TAXONOMY_ID: 10, name: 'Term 10' },
 					'20:20': { TERM_ID: 20, TAXONOMY_ID: 20, name: 'Term 20' },
 					'20:30': { TERM_ID: 20, TAXONOMY_ID: 30, name: 'Term 20' },
 				},
 			},
 			entityIds: {
-				events: [ '10', '20', '30' ],
-				terms: [ '10:10', '20:20', '20:30' ],
+				event: [ '10', '20', '30' ],
+				term: [ '10:10', '20:20', '20:30' ],
 			},
 			dirty: {
-				events: [ '20' ],
-				terms: [ '20:20' ],
+				event: [ '20' ],
+				term: [ '20:20' ],
 			},
 		};
 
@@ -142,7 +142,7 @@ describe( 'receiveEntityRecords()', () => {
 		const state = receiveEntityRecords(
 			originalState,
 			receiveRecordsAction(
-				'events',
+				'event',
 				[
 					{ EVT_ID: 10, name: 'Event 10' },
 					{ EVT_ID: 50, name: 'Event 50' },
@@ -151,24 +151,24 @@ describe( 'receiveEntityRecords()', () => {
 		);
 		const expectedState = {
 			entities: {
-				events: {
+				event: {
 					10: { EVT_ID: 10, name: 'Event 10' },
 					20: { EVT_ID: 20, name: 'Event 20' },
 					30: { EVT_ID: 30, name: 'Event 30' },
 					50: { EVT_ID: 50, name: 'Event 50' },
 				},
-				terms: {
+				term: {
 					'10:10': { TERM_ID: 10, TAXONOMY_ID: 10, name: 'Term 10' },
 					'20:20': { TERM_ID: 20, TAXONOMY_ID: 20, name: 'Term 20' },
 				},
 			},
 			entityIds: {
-				events: [ '10', '20', '30', '50' ],
-				terms: [ '10:10', '20:20' ],
+				event: [ '10', '20', '30', '50' ],
+				term: [ '10:10', '20:20' ],
 			},
 			dirty: {
-				events: [ '20' ],
-				terms: [ '20:20' ],
+				event: [ '20' ],
+				term: [ '20:20' ],
 			},
 		};
 
@@ -181,7 +181,7 @@ describe( 'receiveEntityRecords()', () => {
 		const state = receiveEntityRecords(
 			originalState,
 			receiveRecordsAction(
-				'events',
+				'event',
 				[
 					{ EVT_ID: 10, name: 'Event 10 Modified' },
 					{ EVT_ID: 50, name: 'Event 50' },
@@ -190,24 +190,24 @@ describe( 'receiveEntityRecords()', () => {
 		);
 		const expectedState = {
 			entities: {
-				events: {
+				event: {
 					10: { EVT_ID: 10, name: 'Event 10 Modified' },
 					20: { EVT_ID: 20, name: 'Event 20' },
 					30: { EVT_ID: 30, name: 'Event 30' },
 					50: { EVT_ID: 50, name: 'Event 50' },
 				},
-				terms: {
+				term: {
 					'10:10': { TERM_ID: 10, TAXONOMY_ID: 10, name: 'Term 10' },
 					'20:20': { TERM_ID: 20, TAXONOMY_ID: 20, name: 'Term 20' },
 				},
 			},
 			entityIds: {
-				events: [ '10', '20', '30', '50' ],
-				terms: [ '10:10', '20:20' ],
+				event: [ '10', '20', '30', '50' ],
+				term: [ '10:10', '20:20' ],
 			},
 			dirty: {
-				events: [ '20', '10' ],
-				terms: [ '20:20' ],
+				event: [ '20', '10' ],
+				term: [ '20:20' ],
 			},
 		};
 
@@ -223,7 +223,7 @@ describe( 'cleanEntities()', () => {
 		const state = cleanEntities(
 			originalState,
 			cleanEntitiesAction(
-				'tickets',
+				'ticket',
 				[ { TKT_ID: 10, name: 'Ticket 10' } ],
 			),
 		);
@@ -234,7 +234,7 @@ describe( 'cleanEntities()', () => {
 		const state = cleanEntities(
 			originalState,
 			cleanEntitiesAction(
-				'events',
+				'event',
 				[
 					{ EVT_ID: 20, name: 'Event 20' },
 				],
@@ -248,7 +248,7 @@ describe( 'cleanEntities()', () => {
 		const state = cleanEntities(
 			originalState,
 			cleanEntitiesAction(
-				'events',
+				'event',
 				[
 					{ EVT_ID: 20, name: 'Event 20' },
 					{ EVT_ID: 50, name: 'Event 50' },
@@ -257,23 +257,23 @@ describe( 'cleanEntities()', () => {
 		);
 		const expectedState = {
 			entities: {
-				events: {
+				event: {
 					10: { EVT_ID: 10, name: 'Event 10' },
 					20: { EVT_ID: 20, name: 'Event 20' },
 					30: { EVT_ID: 30, name: 'Event 30' },
 				},
-				terms: {
+				term: {
 					'10:10': { TERM_ID: 10, TAXONOMY_ID: 10, name: 'Term 10' },
 					'20:20': { TERM_ID: 20, TAXONOMY_ID: 20, name: 'Term 20' },
 				},
 			},
 			entityIds: {
-				events: [ '10', '20', '30' ],
-				terms: [ '10:10', '20:20' ],
+				event: [ '10', '20', '30' ],
+				term: [ '10:10', '20:20' ],
 			},
 			dirty: {
-				events: [],
-				terms: [ '20:20' ],
+				event: [],
+				term: [ '20:20' ],
 			},
 		};
 		expect( state ).toEqual( expectedState );
@@ -284,7 +284,7 @@ describe( 'cleanEntities()', () => {
 		const state = cleanEntities(
 			originalState,
 			cleanEntitiesAction(
-				'terms',
+				'term',
 				[
 					{ TERM_ID: 20, TAXONOMY_ID: 20, name: 'Term 20' },
 				],
@@ -292,23 +292,23 @@ describe( 'cleanEntities()', () => {
 		);
 		const expectedState = {
 			entities: {
-				events: {
+				event: {
 					10: { EVT_ID: 10, name: 'Event 10' },
 					20: { EVT_ID: 20, name: 'Event 20' },
 					30: { EVT_ID: 30, name: 'Event 30' },
 				},
-				terms: {
+				term: {
 					'10:10': { TERM_ID: 10, TAXONOMY_ID: 10, name: 'Term 10' },
 					'20:20': { TERM_ID: 20, TAXONOMY_ID: 20, name: 'Term 20' },
 				},
 			},
 			entityIds: {
-				events: [ '10', '20', '30' ],
-				terms: [ '10:10', '20:20' ],
+				event: [ '10', '20', '30' ],
+				term: [ '10:10', '20:20' ],
 			},
 			dirty: {
-				events: [ '20' ],
-				terms: [],
+				event: [ '20' ],
+				term: [],
 			},
 		};
 		expect( state ).toEqual( expectedState );
@@ -321,7 +321,7 @@ describe( 'cleanEntitybyId()', () => {
 		' passed in.', () => {
 		const state = cleanEntityById(
 			originalState,
-			cleanEntityByIdAction( 'tickets', 10 ),
+			cleanEntityByIdAction( 'ticket', 10 ),
 		);
 		expect( state ).toBe( originalState );
 	} );
@@ -330,7 +330,7 @@ describe( 'cleanEntitybyId()', () => {
 		' exist in state', () => {
 		const state = cleanEntityById(
 			originalState,
-			cleanEntityByIdAction( 'events', 50 ),
+			cleanEntityByIdAction( 'event', 50 ),
 		);
 		expect( state ).toBe( originalState );
 	} );
@@ -339,18 +339,18 @@ describe( 'cleanEntitybyId()', () => {
 		' not false', () => {
 		const state = cleanEntityById(
 			originalState,
-			cleanEntityByIdAction( 'events', 20 ),
+			cleanEntityByIdAction( 'event', 20 ),
 		);
 		expect( state ).not.toBe( originalState );
 		expect( state ).toEqual(
 			{
 				entities: {
-					events: {
+					event: {
 						10: { EVT_ID: 10, name: 'Event 10' },
 						20: { EVT_ID: 20, name: 'Event 20' },
 						30: { EVT_ID: 30, name: 'Event 30' },
 					},
-					terms: {
+					term: {
 						'10:10': {
 							TERM_ID: 10,
 							TAXONOMY_ID: 10,
@@ -364,12 +364,12 @@ describe( 'cleanEntitybyId()', () => {
 					},
 				},
 				entityIds: {
-					events: [ '10', '20', '30' ],
-					terms: [ '10:10', '20:20' ],
+					event: [ '10', '20', '30' ],
+					term: [ '10:10', '20:20' ],
 				},
 				dirty: {
-					events: [],
-					terms: [ '20:20' ],
+					event: [],
+					term: [ '20:20' ],
 				},
 			},
 		);
@@ -379,18 +379,18 @@ describe( 'cleanEntitybyId()', () => {
 		' part of a combined primary keys model', () => {
 		const state = cleanEntityById(
 			originalState,
-			cleanEntityByIdAction( 'terms', '20:20' ),
+			cleanEntityByIdAction( 'term', '20:20' ),
 		);
 		expect( state ).not.toBe( originalState );
 		expect( state ).toEqual(
 			{
 				entities: {
-					events: {
+					event: {
 						10: { EVT_ID: 10, name: 'Event 10' },
 						20: { EVT_ID: 20, name: 'Event 20' },
 						30: { EVT_ID: 30, name: 'Event 30' },
 					},
-					terms: {
+					term: {
 						'10:10': {
 							TERM_ID: 10,
 							TAXONOMY_ID: 10,
@@ -404,12 +404,12 @@ describe( 'cleanEntitybyId()', () => {
 					},
 				},
 				entityIds: {
-					events: [ '10', '20', '30' ],
-					terms: [ '10:10', '20:20' ],
+					event: [ '10', '20', '30' ],
+					term: [ '10:10', '20:20' ],
 				},
 				dirty: {
-					events: [ '20' ],
-					terms: [],
+					event: [ '20' ],
+					term: [],
 				},
 			},
 		);
diff --git a/assets/src/data/eventespresso/lists/test/reducers.js b/assets/src/data/eventespresso/lists/test/reducers.js
index a3c50e3a6c0..85e8a86db93 100644
--- a/assets/src/data/eventespresso/lists/test/reducers.js
+++ b/assets/src/data/eventespresso/lists/test/reducers.js
@@ -12,7 +12,7 @@ describe( 'listItems()', () => {
 	it( 'returns the expected default object (from mock data)', () => {
 		const state = listItems( undefined, {} );
 		expect( state ).toEqual(
-			{ events: [], terms: [], tickets: [], venues: [] },
+			{ event: [], term: [], ticket: [], venue: [] },
 		);
 	} );
 	it( 'returns with received events for known model and does not affect' +
diff --git a/assets/src/data/model/test/default-model-state.js b/assets/src/data/model/test/default-model-state.js
index d7eabe8088a..b8c42efd0c5 100644
--- a/assets/src/data/model/test/default-model-state.js
+++ b/assets/src/data/model/test/default-model-state.js
@@ -7,10 +7,10 @@ describe( 'DEFAULT_LISTS_STATE', () => {
 	it( 'matches expected initial state for the models exposed ' +
 		'on the endpoints', () => {
 		const expectedState = {
-			events: [],
-			tickets: [],
-			venues: [],
-			terms: [],
+			event: [],
+			ticket: [],
+			venue: [],
+			term: [],
 		};
 		expect( DEFAULT_LISTS_STATE ).toEqual( expectedState );
 	} );
@@ -21,22 +21,22 @@ describe( 'DEFAULT_CORE_STATE', () => {
 		' on the endpoints', () => {
 		const expectedState = {
 			entities: {
-				events: {},
-				tickets: {},
-				venues: {},
-				terms: {},
+				event: {},
+				ticket: {},
+				venue: {},
+				term: {},
 			},
 			entityIds: {
-				events: [],
-				tickets: [],
-				venues: [],
-				terms: [],
+				event: [],
+				ticket: [],
+				venue: [],
+				term: [],
 			},
 			dirty: {
-				events: [],
-				tickets: [],
-				venues: [],
-				terms: [],
+				event: [],
+				ticket: [],
+				venue: [],
+				term: [],
 			},
 		};
 		expect( DEFAULT_CORE_STATE ).toEqual( expectedState );
diff --git a/assets/src/data/model/test/endpoints.js b/assets/src/data/model/test/endpoints.js
index 72ed69c5fb3..2070714ebe7 100644
--- a/assets/src/data/model/test/endpoints.js
+++ b/assets/src/data/model/test/endpoints.js
@@ -10,10 +10,10 @@ describe( 'endpoints', () => {
 	it( 'has the expected values from eejs.data', () => {
 		expect( endpoints ).toEqual(
 			{
-				events: '/ee/v4.8.36/events',
-				tickets: '/ee/v4.8.36/tickets',
-				venues: '/ee/v4.8.36/venues',
-				terms: '/ee/v4.8.36/terms',
+				event: '/ee/v4.8.36/events',
+				ticket: '/ee/v4.8.36/tickets',
+				venue: '/ee/v4.8.36/venues',
+				term: '/ee/v4.8.36/terms',
 			},
 		);
 	} );
@@ -30,7 +30,7 @@ describe( 'getEndpoint()', () => {
 
 	it( 'returns the correct endpoint value for the requested model', () => {
 		expect(
-			getEndpoint( 'events' ),
+			getEndpoint( 'event' ),
 		).toEqual( '/ee/v4.8.36/events' );
 	} );
 } );
@@ -40,7 +40,7 @@ describe( 'applyQueryString()', () => {
 		' for a valid model', () => {
 		const queryString = 'something=1';
 		expect(
-			applyQueryString( 'events', queryString ),
+			applyQueryString( 'event', queryString ),
 		).toEqual( '/ee/v4.8.36/events?' + queryString );
 	} );
 } );
diff --git a/assets/src/data/model/test/primary-keys.js b/assets/src/data/model/test/primary-keys.js
index d042281d9bf..6e210d0dc99 100644
--- a/assets/src/data/model/test/primary-keys.js
+++ b/assets/src/data/model/test/primary-keys.js
@@ -13,10 +13,10 @@ describe( 'primaryKeys', () => {
 	it( 'has the expected values from the mock data', () => {
 		expect( primaryKeys ).toEqual(
 			{
-				events: 'EVT_ID',
-				tickets: 'TKT_ID',
-				venues: 'VNU_ID',
-				terms: [ 'TERM_ID', 'TAXONOMY_ID' ],
+				event: 'EVT_ID',
+				ticket: 'TKT_ID',
+				venue: 'VNU_ID',
+				term: [ 'TERM_ID', 'TAXONOMY_ID' ],
 			},
 		);
 	} );
@@ -83,8 +83,8 @@ describe( 'getPrimaryKey()', () => {
 
 	it( 'returns the expected key from the mock data for the provided' +
 		' modelName', () => {
-		expect( getPrimaryKey( 'events' ) ).toEqual( 'EVT_ID' );
-		expect( getPrimaryKey( 'terms' ) )
+		expect( getPrimaryKey( 'event' ) ).toEqual( 'EVT_ID' );
+		expect( getPrimaryKey( 'term' ) )
 			.toEqual( [ 'TERM_ID', 'TAXONOMY_ID' ] );
 	} );
 } );
@@ -92,13 +92,13 @@ describe( 'getPrimaryKey()', () => {
 describe( 'getEntityPrimaryKeyValues()', () => {
 	it( 'returns expected value from provided entity belonging to a model' +
 		' with a singular primary key', () => {
-		expect( getEntityPrimaryKeyValues( 'events', { EVT_ID: 10 } ) )
+		expect( getEntityPrimaryKeyValues( 'event', { EVT_ID: 10 } ) )
 			.toEqual( 10 );
 	} );
 	it( 'returns expected value from provided entity belonging to a model ' +
 		'with combined primary keys', () => {
 		expect( getEntityPrimaryKeyValues(
-			'terms',
+			'term',
 			{ TERM_ID: 10, TAXONOMY_ID: 20 },
 		) ).toEqual( '10:20' );
 	} );
@@ -107,7 +107,7 @@ describe( 'getEntityPrimaryKeyValues()', () => {
 describe( 'keyEntitiesByPrimaryKeyValue()', () => {
 	it( 'throws an error if entities is empty', () => {
 		const t = () => {
-			keyEntitiesByPrimaryKeyValue( 'events', [] );
+			keyEntitiesByPrimaryKeyValue( 'event', [] );
 		};
 		expect( t ).toThrow( Exception );
 		expect( t )
@@ -115,7 +115,7 @@ describe( 'keyEntitiesByPrimaryKeyValue()', () => {
 	} );
 	it( 'throws an error if entities is not an array', () => {
 		const t = () => {
-			keyEntitiesByPrimaryKeyValue( 'events', { EVT_ID: 10 } );
+			keyEntitiesByPrimaryKeyValue( 'event', { EVT_ID: 10 } );
 		};
 		expect( t ).toThrow( Exception );
 		expect( t )
@@ -130,7 +130,7 @@ describe( 'keyEntitiesByPrimaryKeyValue()', () => {
 			50: { EVT_ID: 50 },
 		};
 		expect( keyEntitiesByPrimaryKeyValue(
-			'events',
+			'event',
 			[
 				{ EVT_ID: 10 },
 				{ EVT_ID: 20 },
@@ -147,7 +147,7 @@ describe( 'keyEntitiesByPrimaryKeyValue()', () => {
 			'50:6': { TERM_ID: 50, TAXONOMY_ID: 6 },
 		};
 		expect( keyEntitiesByPrimaryKeyValue(
-			'terms',
+			'term',
 			[
 				{ TERM_ID: 10, TAXONOMY_ID: 20 },
 				{ TERM_ID: 20, TAXONOMY_ID: 10 },