diff --git a/src/common/__tests__/dateHelpers.test.js b/src/common/__tests__/dateHelpers.test.js
index 0ce3cee2c..cb134a1e6 100644
--- a/src/common/__tests__/dateHelpers.test.js
+++ b/src/common/__tests__/dateHelpers.test.js
@@ -5,7 +5,7 @@ import {
   getRangedDateTime,
   getRangedMonthDateTime
 } from '../dateHelpers';
-import { RHSM_API_QUERY_GRANULARITY_TYPES as GRANULARITY_TYPES } from '../../types/rhsmApiTypes';
+import { RHSM_API_QUERY_GRANULARITY_TYPES as GRANULARITY_TYPES } from '../../services/rhsm/rhsmConstants';
 
 describe('DateHelpers', () => {
   it('should have specific functions', () => {
diff --git a/src/common/dateHelpers.js b/src/common/dateHelpers.js
index 09ebb5faa..946d899bb 100644
--- a/src/common/dateHelpers.js
+++ b/src/common/dateHelpers.js
@@ -1,6 +1,6 @@
 import moment from 'moment/moment';
 import { helpers } from './helpers';
-import { RHSM_API_QUERY_GRANULARITY_TYPES as GRANULARITY_TYPES } from '../types/rhsmApiTypes';
+import { RHSM_API_QUERY_GRANULARITY_TYPES as GRANULARITY_TYPES } from '../services/rhsm/rhsmConstants';
 import { translate } from '../components/i18n/i18n';
 
 /**
diff --git a/src/components/authentication/__tests__/authentication.test.js b/src/components/authentication/__tests__/authentication.test.js
index 2b8488c54..8717a6b09 100644
--- a/src/components/authentication/__tests__/authentication.test.js
+++ b/src/components/authentication/__tests__/authentication.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { helpers } from '../../../common';
 import { Authentication } from '../authentication';
-import { rhsmApiTypes } from '../../../types';
+import { rhsmConstants } from '../../../services/rhsm/rhsmConstants';
 
 describe('Authentication Component', () => {
   it('should render a basic component', async () => {
@@ -76,7 +76,7 @@ describe('Authentication Component', () => {
         pending: false,
         data: {
           authorized: {},
-          errorCodes: [rhsmApiTypes.RHSM_API_RESPONSE_ERROR_DATA_CODE_TYPES.OPTIN],
+          errorCodes: [rhsmConstants.RHSM_API_RESPONSE_ERRORS_CODE_TYPES.OPTIN],
           errorStatus: 403
         }
       })
diff --git a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
index 8b89b2e32..b10fa1997 100644
--- a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
+++ b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
@@ -448,7 +448,7 @@ exports[`I18n Component should generate a predictable locale key output snapshot
     "keys": [
       {
         "key": "curiosity-toolbar.category",
-        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_TYPES.GRANULARITY })",
+        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_SET_TYPES.GRANULARITY })",
       },
       {
         "key": "curiosity-toolbar.category",
@@ -456,19 +456,19 @@ exports[`I18n Component should generate a predictable locale key output snapshot
       },
       {
         "key": "curiosity-toolbar.category",
-        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_TYPES.UOM })",
+        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_SET_TYPES.UOM })",
       },
       {
         "key": "curiosity-toolbar.category",
-        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_TYPES.BILLING_PROVIDER })",
+        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_SET_TYPES.BILLING_PROVIDER })",
       },
       {
         "key": "curiosity-toolbar.category",
-        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_TYPES.SLA })",
+        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_SET_TYPES.SLA })",
       },
       {
         "key": "curiosity-toolbar.category",
-        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_TYPES.USAGE })",
+        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_SET_TYPES.USAGE })",
       },
       {
         "key": "curiosity-toolbar.placeholder_filter",
diff --git a/src/components/inventoryCard/__tests__/inventoryCardHelpers.test.js b/src/components/inventoryCard/__tests__/inventoryCardHelpers.test.js
index da1755cfc..d4a1b1352 100644
--- a/src/components/inventoryCard/__tests__/inventoryCardHelpers.test.js
+++ b/src/components/inventoryCard/__tests__/inventoryCardHelpers.test.js
@@ -7,9 +7,9 @@ import {
   parseRowCellsListData
 } from '../inventoryCardHelpers';
 import {
-  RHSM_API_QUERY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES,
-  RHSM_API_QUERY_TYPES
-} from '../../../types/rhsmApiTypes';
+  RHSM_API_QUERY_INVENTORY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES,
+  RHSM_API_QUERY_SET_TYPES
+} from '../../../services/rhsm/rhsmConstants';
 
 describe('InventoryListHelpers', () => {
   it('should have specific functions', () => {
@@ -188,12 +188,12 @@ describe('InventoryListHelpers', () => {
       ascending: applySortFilters({
         filter,
         onSort: () => {},
-        query: { [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING }
+        query: { [RHSM_API_QUERY_SET_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING }
       }),
       descending: applySortFilters({
         filter,
         onSort: () => {},
-        query: { [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.DESCENDING }
+        query: { [RHSM_API_QUERY_SET_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.DESCENDING }
       })
     }).toMatchSnapshot('sortable, direction');
 
@@ -202,8 +202,8 @@ describe('InventoryListHelpers', () => {
         filter,
         onSort: () => {},
         query: {
-          [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING,
-          [RHSM_API_QUERY_TYPES.SORT]: 'lorem'
+          [RHSM_API_QUERY_SET_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING,
+          [RHSM_API_QUERY_SET_TYPES.SORT]: 'lorem'
         }
       })
     ).toMatchSnapshot('sortable, active column');
diff --git a/src/components/inventoryCard/inventoryCardHelpers.js b/src/components/inventoryCard/inventoryCardHelpers.js
index 271cc3d92..9c39ae827 100644
--- a/src/components/inventoryCard/inventoryCardHelpers.js
+++ b/src/components/inventoryCard/inventoryCardHelpers.js
@@ -5,9 +5,9 @@ import _isPlainObject from 'lodash/isPlainObject';
 import { Tooltip } from '../tooltip/tooltip';
 import { translate } from '../i18n/i18n';
 import {
-  RHSM_API_QUERY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES,
-  RHSM_API_QUERY_TYPES
-} from '../../types/rhsmApiTypes';
+  RHSM_API_QUERY_INVENTORY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES,
+  RHSM_API_QUERY_SET_TYPES
+} from '../../services/rhsm/rhsmConstants';
 import { helpers } from '../../common';
 
 /**
@@ -188,15 +188,16 @@ const applySortFilters = ({ filter = {}, onSort, query = {} } = {}) => {
   if (
     hasSort &&
     typeof updatedFilter.sortActive !== 'boolean' &&
-    query?.[RHSM_API_QUERY_TYPES.SORT] &&
-    (query?.[RHSM_API_QUERY_TYPES.SORT] === updatedId || _camelCase(query?.[RHSM_API_QUERY_TYPES.SORT]) === updatedId)
+    query?.[RHSM_API_QUERY_SET_TYPES.SORT] &&
+    (query?.[RHSM_API_QUERY_SET_TYPES.SORT] === updatedId ||
+      _camelCase(query?.[RHSM_API_QUERY_SET_TYPES.SORT]) === updatedId)
   ) {
     updatedFilter.sortActive = true;
   }
 
   // set sort direction
-  if (hasSort && !updatedFilter.sortDirection && query?.[RHSM_API_QUERY_TYPES.DIRECTION]) {
-    switch (query?.[RHSM_API_QUERY_TYPES.DIRECTION]) {
+  if (hasSort && !updatedFilter.sortDirection && query?.[RHSM_API_QUERY_SET_TYPES.DIRECTION]) {
+    switch (query?.[RHSM_API_QUERY_SET_TYPES.DIRECTION]) {
       case SORT_DIRECTION_TYPES.DESCENDING:
         updatedFilter.sortDirection = SortByDirection.desc;
         break;
@@ -209,7 +210,7 @@ const applySortFilters = ({ filter = {}, onSort, query = {} } = {}) => {
   if (
     hasSort &&
     !updatedFilter.sortActive &&
-    !query?.[RHSM_API_QUERY_TYPES.SORT] &&
+    !query?.[RHSM_API_QUERY_SET_TYPES.SORT] &&
     updatedFilter.isSortDefault === true
   ) {
     updatedFilter.sortActive = true;
diff --git a/src/components/productView/__tests__/productViewContext.test.js b/src/components/productView/__tests__/productViewContext.test.js
index c1faba6ef..9aa6368dc 100644
--- a/src/components/productView/__tests__/productViewContext.test.js
+++ b/src/components/productView/__tests__/productViewContext.test.js
@@ -14,7 +14,7 @@ import {
   useProductInventorySubscriptionsConfig,
   useProductToolbarConfig
 } from '../productViewContext';
-import { rhsmApiTypes } from '../../../types/rhsmApiTypes';
+import { rhsmConstants } from '../../../services/rhsm/rhsmConstants';
 import { config as openshiftContainerConfig } from '../../../config/product.openshiftContainer';
 
 describe('ProductViewContext', () => {
@@ -39,10 +39,10 @@ describe('ProductViewContext', () => {
   it('should apply hooks for retrieving specific api queries', () => {
     const mockContextValue = {
       query: { lorem: 'ipsum' },
-      graphTallyQuery: { [rhsmApiTypes.RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES.GRANULARITY]: 'testGranularity' },
-      inventoryGuestsQuery: { [rhsmApiTypes.RHSM_API_QUERY_SET_INVENTORY_GUESTS_TYPES.OFFSET]: 'testOffset' },
-      inventoryHostsQuery: { [rhsmApiTypes.RHSM_API_QUERY_SET_INVENTORY_TYPES.LIMIT]: 'testLimit' },
-      inventorySubscriptionsQuery: { [rhsmApiTypes.RHSM_API_QUERY_SET_INVENTORY_SUBSCRIPTIONS_TYPES.SLA]: 'testSla' },
+      graphTallyQuery: { [rhsmConstants.RHSM_API_QUERY_SET_TALLY_CAPACITY_TYPES.GRANULARITY]: 'testGranularity' },
+      inventoryGuestsQuery: { [rhsmConstants.RHSM_API_QUERY_SET_INVENTORY_TYPES.OFFSET]: 'testOffset' },
+      inventoryHostsQuery: { [rhsmConstants.RHSM_API_QUERY_SET_INVENTORY_TYPES.LIMIT]: 'testLimit' },
+      inventorySubscriptionsQuery: { [rhsmConstants.RHSM_API_QUERY_SET_INVENTORY_TYPES.SLA]: 'testSla' },
       productId: 'lorem',
       viewId: 'viewIpsum'
     };
@@ -89,7 +89,7 @@ describe('ProductViewContext', () => {
     const { result: openshiftUomCores } = shallowHook(() =>
       useProductContext({
         useProductQuery: () => ({
-          [rhsmApiTypes.RHSM_API_QUERY_TYPES.UOM]: rhsmApiTypes.RHSM_API_QUERY_UOM_TYPES.CORES
+          [rhsmConstants.RHSM_API_QUERY_SET_TYPES.UOM]: rhsmConstants.RHSM_API_QUERY_UOM_TYPES.CORES
         }),
         useProductViewContext: () => openshiftContainerConfig
       })
@@ -99,7 +99,7 @@ describe('ProductViewContext', () => {
     const { result: openshiftUomSockets } = shallowHook(() =>
       useProductContext({
         useProductQuery: () => ({
-          [rhsmApiTypes.RHSM_API_QUERY_TYPES.UOM]: rhsmApiTypes.RHSM_API_QUERY_UOM_TYPES.SOCKETS
+          [rhsmConstants.RHSM_API_QUERY_SET_TYPES.UOM]: rhsmConstants.RHSM_API_QUERY_UOM_TYPES.SOCKETS
         }),
         useProductViewContext: () => openshiftContainerConfig
       })
diff --git a/src/components/productView/productViewContext.js b/src/components/productView/productViewContext.js
index 19cb84ddd..4cbcb728b 100644
--- a/src/components/productView/productViewContext.js
+++ b/src/components/productView/productViewContext.js
@@ -1,8 +1,7 @@
 import React, { useCallback, useContext } from 'react';
 import { reduxHelpers } from '../../redux/common';
 import { storeHooks } from '../../redux/hooks';
-import { RHSM_API_QUERY_TYPES, rhsmApiTypes } from '../../types/rhsmApiTypes';
-import { RHSM_API_QUERY_SET_TYPES } from '../../services/rhsm/rhsmConstants';
+import { rhsmConstants, RHSM_API_QUERY_SET_TYPES } from '../../services/rhsm/rhsmConstants';
 import { helpers } from '../../common/helpers';
 
 /**
@@ -68,7 +67,7 @@ const useProductQuery = ({ queryType = 'query', options } = {}) => useProductQue
  */
 const useProductGraphTallyQuery = ({
   queryType = 'graphTallyQuery',
-  schemaCheck = rhsmApiTypes.RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES,
+  schemaCheck = rhsmConstants.RHSM_API_QUERY_SET_TALLY_CAPACITY_TYPES,
   options
 } = {}) =>
   reduxHelpers.setApiQuery(
@@ -94,7 +93,7 @@ const useProductInventoryGuestsQuery = ({
   defaultLimit = 100,
   defaultOffset = 0,
   queryType = 'inventoryGuestsQuery',
-  schemaCheck = rhsmApiTypes.RHSM_API_QUERY_SET_INVENTORY_GUESTS_TYPES,
+  schemaCheck = rhsmConstants.RHSM_API_QUERY_SET_INVENTORY_TYPES,
   options
 } = {}) =>
   reduxHelpers.setApiQuery(
@@ -118,7 +117,7 @@ const useProductInventoryGuestsQuery = ({
  */
 const useProductInventoryHostsQuery = ({
   queryType = 'inventoryHostsQuery',
-  schemaCheck = rhsmApiTypes.RHSM_API_QUERY_SET_INVENTORY_TYPES,
+  schemaCheck = rhsmConstants.RHSM_API_QUERY_SET_INVENTORY_TYPES,
   options
 } = {}) =>
   reduxHelpers.setApiQuery(
@@ -140,7 +139,7 @@ const useProductInventoryHostsQuery = ({
  */
 const useProductInventorySubscriptionsQuery = ({
   queryType = 'inventorySubscriptionsQuery',
-  schemaCheck = rhsmApiTypes.RHSM_API_QUERY_SET_INVENTORY_TYPES,
+  schemaCheck = rhsmConstants.RHSM_API_QUERY_SET_INVENTORY_TYPES,
   options
 } = {}) =>
   reduxHelpers.setApiQuery(
@@ -163,7 +162,7 @@ const useProductContext = ({
   useProductQuery: useAliasProductQuery = useProductQuery,
   useProductViewContext: useAliasProductViewContext = useProductViewContext
 } = {}) => {
-  const { [RHSM_API_QUERY_TYPES.UOM]: uomFilter } = useAliasProductQuery();
+  const { [RHSM_API_QUERY_SET_TYPES.UOM]: uomFilter } = useAliasProductQuery();
   const {
     initialGraphFilters = [],
     initialInventoryFilters = [],
diff --git a/src/components/toolbar/__tests__/toolbar.test.js b/src/components/toolbar/__tests__/toolbar.test.js
index b8cc5e875..ccccd1164 100644
--- a/src/components/toolbar/__tests__/toolbar.test.js
+++ b/src/components/toolbar/__tests__/toolbar.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { ToolbarFilter } from '@patternfly/react-core';
 import { Toolbar } from '../toolbar';
-import { RHSM_API_QUERY_SLA_TYPES, RHSM_API_QUERY_TYPES } from '../../../types/rhsmApiTypes';
+import { RHSM_API_QUERY_SLA_TYPES, RHSM_API_QUERY_SET_TYPES } from '../../../services/rhsm/rhsmConstants';
 import { toolbarFieldOptions as selectCategoryOptions } from '../toolbarFieldSelectCategory';
 
 describe('Toolbar Component', () => {
@@ -48,7 +48,7 @@ describe('Toolbar Component', () => {
   it('should handle updating toolbar chips', () => {
     const props = {
       useSelectCategoryOptions: () => ({ options: [selectCategoryOptions[4]] }),
-      useToolbarFieldQueries: () => ({ [RHSM_API_QUERY_TYPES.SLA]: RHSM_API_QUERY_SLA_TYPES.PREMIUM })
+      useToolbarFieldQueries: () => ({ [RHSM_API_QUERY_SET_TYPES.SLA]: RHSM_API_QUERY_SLA_TYPES.PREMIUM })
     };
     const component = shallow(<Toolbar {...props} />);
 
diff --git a/src/components/toolbar/__tests__/toolbarFieldDisplayName.test.js b/src/components/toolbar/__tests__/toolbarFieldDisplayName.test.js
index f689634bc..7e24587a9 100644
--- a/src/components/toolbar/__tests__/toolbarFieldDisplayName.test.js
+++ b/src/components/toolbar/__tests__/toolbarFieldDisplayName.test.js
@@ -4,7 +4,7 @@ import { ToolbarFieldDisplayName } from '../toolbarFieldDisplayName';
 import { store } from '../../../redux/store';
 import { TextInput } from '../../form/textInput';
 import { helpers } from '../../../common/helpers';
-import { RHSM_API_QUERY_TYPES } from '../../../types/rhsmApiTypes';
+import { RHSM_API_QUERY_SET_TYPES } from '../../../services/rhsm/rhsmConstants';
 
 describe('ToolbarFieldDisplayName Component', () => {
   let mockDispatch;
@@ -20,7 +20,7 @@ describe('ToolbarFieldDisplayName Component', () => {
   it('should render a basic component', () => {
     const props = {
       useProduct: () => ({ viewId: 'loremIpsum' }),
-      useProductInventoryHostsQuery: () => ({ [RHSM_API_QUERY_TYPES.DISPLAY_NAME]: 'lorem ipsum' })
+      useProductInventoryHostsQuery: () => ({ [RHSM_API_QUERY_SET_TYPES.DISPLAY_NAME]: 'lorem ipsum' })
     };
     const component = shallow(<ToolbarFieldDisplayName {...props} />);
 
@@ -30,7 +30,7 @@ describe('ToolbarFieldDisplayName Component', () => {
   it('should handle updating display name through redux state', () => {
     const props = {
       useProduct: () => ({ viewId: 'loremIpsum' }),
-      useProductInventoryHostsQuery: () => ({ [RHSM_API_QUERY_TYPES.DISPLAY_NAME]: 'lorem ipsum' })
+      useProductInventoryHostsQuery: () => ({ [RHSM_API_QUERY_SET_TYPES.DISPLAY_NAME]: 'lorem ipsum' })
     };
 
     const component = shallow(<ToolbarFieldDisplayName {...props} />);
@@ -43,7 +43,7 @@ describe('ToolbarFieldDisplayName Component', () => {
   it('should handle updating display name using the enter key', async () => {
     const props = {
       useProduct: () => ({ viewId: 'loremIpsum' }),
-      useProductInventoryHostsQuery: () => ({ [RHSM_API_QUERY_TYPES.DISPLAY_NAME]: 'lorem ipsum' })
+      useProductInventoryHostsQuery: () => ({ [RHSM_API_QUERY_SET_TYPES.DISPLAY_NAME]: 'lorem ipsum' })
     };
 
     const component = await mountHookComponent(<ToolbarFieldDisplayName {...props} />);
@@ -56,7 +56,7 @@ describe('ToolbarFieldDisplayName Component', () => {
   it('should handle clearing display name through redux state', async () => {
     const props = {
       useProduct: () => ({ viewId: 'loremIpsum' }),
-      useProductInventoryHostsQuery: () => ({ [RHSM_API_QUERY_TYPES.DISPLAY_NAME]: 'lorem ipsum' })
+      useProductInventoryHostsQuery: () => ({ [RHSM_API_QUERY_SET_TYPES.DISPLAY_NAME]: 'lorem ipsum' })
     };
 
     const component = await mountHookComponent(<ToolbarFieldDisplayName {...props} />);
diff --git a/src/components/toolbar/__tests__/toolbarFieldGranularity.test.js b/src/components/toolbar/__tests__/toolbarFieldGranularity.test.js
index fbf101726..32eaa48b4 100644
--- a/src/components/toolbar/__tests__/toolbarFieldGranularity.test.js
+++ b/src/components/toolbar/__tests__/toolbarFieldGranularity.test.js
@@ -4,8 +4,8 @@ import { ToolbarFieldGranularity, toolbarFieldOptions, useOnSelect } from '../to
 import { store } from '../../../redux/store';
 import {
   RHSM_API_QUERY_GRANULARITY_TYPES as GRANULARITY_TYPES,
-  RHSM_API_QUERY_TYPES
-} from '../../../types/rhsmApiTypes';
+  RHSM_API_QUERY_SET_TYPES
+} from '../../../services/rhsm/rhsmConstants';
 
 describe('ToolbarFieldGranularity Component', () => {
   let mockDispatch;
@@ -20,7 +20,7 @@ describe('ToolbarFieldGranularity Component', () => {
 
   it('should render a basic component', () => {
     const props = {
-      useProductGraphTallyQuery: () => ({ [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.WEEKLY })
+      useProductGraphTallyQuery: () => ({ [RHSM_API_QUERY_SET_TYPES.GRANULARITY]: GRANULARITY_TYPES.WEEKLY })
     };
     const component = shallow(<ToolbarFieldGranularity {...props} />);
 
diff --git a/src/components/toolbar/__tests__/toolbarFieldRangedMonthly.test.js b/src/components/toolbar/__tests__/toolbarFieldRangedMonthly.test.js
index 296793a1c..ece8e227d 100644
--- a/src/components/toolbar/__tests__/toolbarFieldRangedMonthly.test.js
+++ b/src/components/toolbar/__tests__/toolbarFieldRangedMonthly.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { ToolbarFieldRangedMonthly, toolbarFieldOptions, useOnSelect } from '../toolbarFieldRangedMonthly';
 import { store } from '../../../redux/store';
-import { RHSM_API_QUERY_TYPES } from '../../../types/rhsmApiTypes';
+import { RHSM_API_QUERY_SET_TYPES } from '../../../services/rhsm/rhsmConstants';
 
 describe('ToolbarFieldRangedMonthly Component', () => {
   let mockDispatch;
@@ -18,7 +18,7 @@ describe('ToolbarFieldRangedMonthly Component', () => {
   it('should render a basic component', () => {
     const props = {
       useProductGraphTallyQuery: () => ({
-        [RHSM_API_QUERY_TYPES.START_DATE]: 't(curiosity-toolbar.granularityRangedMonthly, {"context":"current"})'
+        [RHSM_API_QUERY_SET_TYPES.START_DATE]: 't(curiosity-toolbar.granularityRangedMonthly, {"context":"current"})'
       })
     };
     const component = shallow(<ToolbarFieldRangedMonthly {...props} />);
@@ -32,7 +32,7 @@ describe('ToolbarFieldRangedMonthly Component', () => {
 
   it('should handle selecting an option directly', () => {
     const props = {
-      useProductGraphTallyQuery: () => ({ [RHSM_API_QUERY_TYPES.START_DATE]: '2018-08-01T00:00:00.000Z' })
+      useProductGraphTallyQuery: () => ({ [RHSM_API_QUERY_SET_TYPES.START_DATE]: '2018-08-01T00:00:00.000Z' })
     };
     const component = shallow(<ToolbarFieldRangedMonthly {...props} />);
 
diff --git a/src/components/toolbar/__tests__/toolbarFieldSelectCategory.test.js b/src/components/toolbar/__tests__/toolbarFieldSelectCategory.test.js
index 58a0d865b..c4b07d3f6 100644
--- a/src/components/toolbar/__tests__/toolbarFieldSelectCategory.test.js
+++ b/src/components/toolbar/__tests__/toolbarFieldSelectCategory.test.js
@@ -8,7 +8,7 @@ import {
   toolbarFieldOptions as selectCategoryOptions
 } from '../toolbarFieldSelectCategory';
 import { store } from '../../../redux/store';
-import { RHSM_API_QUERY_TYPES } from '../../../types/rhsmApiTypes';
+import { RHSM_API_QUERY_SET_TYPES } from '../../../services/rhsm/rhsmConstants';
 
 describe('ToolbarFieldSelectCategory Component', () => {
   let mockDispatch;
@@ -25,7 +25,7 @@ describe('ToolbarFieldSelectCategory Component', () => {
     const props = {
       useSelectCategoryOptions: () => ({
         options: [selectCategoryOptions[4], selectCategoryOptions[5]],
-        currentCategory: RHSM_API_QUERY_TYPES.SLA
+        currentCategory: RHSM_API_QUERY_SET_TYPES.SLA
       })
     };
     const component = shallow(<ToolbarFieldSelectCategory {...props} />);
@@ -70,7 +70,7 @@ describe('ToolbarFieldSelectCategory Component', () => {
     const options = {
       useProduct: () => ({ viewId: 'loremIpsum' }),
       useProductToolbarConfig: () => ({
-        filters: [{ id: RHSM_API_QUERY_TYPES.USAGE, selected: true }, { id: RHSM_API_QUERY_TYPES.SLA }]
+        filters: [{ id: RHSM_API_QUERY_SET_TYPES.USAGE, selected: true }, { id: RHSM_API_QUERY_SET_TYPES.SLA }]
       }),
       useSelector: () => ({ currentFilter: undefined })
     };
@@ -80,7 +80,7 @@ describe('ToolbarFieldSelectCategory Component', () => {
     expect(initialResult).toMatchSnapshot('options, initialCategory, hook');
 
     const { result: updatedResult } = shallowHook(() =>
-      useSelectCategoryOptions({ ...options, useSelector: () => ({ currentFilter: RHSM_API_QUERY_TYPES.SLA }) })
+      useSelectCategoryOptions({ ...options, useSelector: () => ({ currentFilter: RHSM_API_QUERY_SET_TYPES.SLA }) })
     );
 
     expect(updatedResult).toMatchSnapshot('options, currentCategory, hook');
diff --git a/src/components/toolbar/__tests__/toolbarFieldSla.test.js b/src/components/toolbar/__tests__/toolbarFieldSla.test.js
index c3368bd36..1eef1d4f7 100644
--- a/src/components/toolbar/__tests__/toolbarFieldSla.test.js
+++ b/src/components/toolbar/__tests__/toolbarFieldSla.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { ToolbarFieldSla, toolbarFieldOptions, useOnSelect } from '../toolbarFieldSla';
 import { store } from '../../../redux/store';
-import { RHSM_API_QUERY_SLA_TYPES as SLA_TYPES, RHSM_API_QUERY_TYPES } from '../../../types/rhsmApiTypes';
+import { RHSM_API_QUERY_SLA_TYPES as SLA_TYPES, RHSM_API_QUERY_SET_TYPES } from '../../../services/rhsm/rhsmConstants';
 
 describe('ToolbarFieldSla Component', () => {
   let mockDispatch;
@@ -17,7 +17,7 @@ describe('ToolbarFieldSla Component', () => {
 
   it('should render a basic component', () => {
     const props = {
-      useProductQuery: () => ({ [RHSM_API_QUERY_TYPES.SLA]: SLA_TYPES.STANDARD })
+      useProductQuery: () => ({ [RHSM_API_QUERY_SET_TYPES.SLA]: SLA_TYPES.STANDARD })
     };
     const component = shallow(<ToolbarFieldSla {...props} />);
 
diff --git a/src/components/toolbar/__tests__/toolbarFieldUom.test.js b/src/components/toolbar/__tests__/toolbarFieldUom.test.js
index 303b9011c..a7be05c5d 100644
--- a/src/components/toolbar/__tests__/toolbarFieldUom.test.js
+++ b/src/components/toolbar/__tests__/toolbarFieldUom.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { ToolbarFieldUom, toolbarFieldOptions, useOnSelect } from '../toolbarFieldUom';
 import { store } from '../../../redux/store';
-import { RHSM_API_QUERY_UOM_TYPES as UOM_TYPES, RHSM_API_QUERY_TYPES } from '../../../types/rhsmApiTypes';
+import { RHSM_API_QUERY_UOM_TYPES as UOM_TYPES, RHSM_API_QUERY_SET_TYPES } from '../../../services/rhsm/rhsmConstants';
 
 describe('ToolbarFieldUom Component', () => {
   let mockDispatch;
@@ -17,7 +17,7 @@ describe('ToolbarFieldUom Component', () => {
 
   it('should render a basic component', () => {
     const props = {
-      useProductQuery: () => ({ [RHSM_API_QUERY_TYPES.UOM]: UOM_TYPES.SOCKETS })
+      useProductQuery: () => ({ [RHSM_API_QUERY_SET_TYPES.UOM]: UOM_TYPES.SOCKETS })
     };
     const component = shallow(<ToolbarFieldUom {...props} />);
 
diff --git a/src/components/toolbar/__tests__/toolbarFieldUsage.test.js b/src/components/toolbar/__tests__/toolbarFieldUsage.test.js
index 8ee46fcb1..3783c4251 100644
--- a/src/components/toolbar/__tests__/toolbarFieldUsage.test.js
+++ b/src/components/toolbar/__tests__/toolbarFieldUsage.test.js
@@ -2,7 +2,10 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { ToolbarFieldUsage, toolbarFieldOptions, useOnSelect } from '../toolbarFieldUsage';
 import { store } from '../../../redux/store';
-import { RHSM_API_QUERY_USAGE_TYPES as USAGE_TYPES, RHSM_API_QUERY_TYPES } from '../../../types/rhsmApiTypes';
+import {
+  RHSM_API_QUERY_USAGE_TYPES as USAGE_TYPES,
+  RHSM_API_QUERY_SET_TYPES
+} from '../../../services/rhsm/rhsmConstants';
 
 describe('ToolbarFieldSla Component', () => {
   let mockDispatch;
@@ -17,7 +20,7 @@ describe('ToolbarFieldSla Component', () => {
 
   it('should render a basic component', () => {
     const props = {
-      useProductQuery: () => ({ [RHSM_API_QUERY_TYPES.USAGE]: USAGE_TYPES.DEVELOPMENT })
+      useProductQuery: () => ({ [RHSM_API_QUERY_SET_TYPES.USAGE]: USAGE_TYPES.DEVELOPMENT })
     };
     const component = shallow(<ToolbarFieldUsage {...props} />);
 
diff --git a/src/components/toolbar/toolbarContext.js b/src/components/toolbar/toolbarContext.js
index 4cdd37bc7..97781dc8d 100644
--- a/src/components/toolbar/toolbarContext.js
+++ b/src/components/toolbar/toolbarContext.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { useProductQuery, useProductGraphTallyQuery, useProductToolbarConfig } from '../productView/productViewContext';
-import { RHSM_API_QUERY_SET_TYPES as RHSM_API_QUERY_TYPES } from '../../services/rhsm/rhsmConstants';
+import { RHSM_API_QUERY_SET_TYPES } from '../../services/rhsm/rhsmConstants';
 import { useOnSelect as useSelectCategoryOnSelect, toolbarFieldOptions } from './toolbarFieldSelectCategory';
 import { useOnSelect as useBillingProviderOnSelect } from './toolbarFieldBillingProvider';
 import { useOnSelect as useSlaOnSelect } from './toolbarFieldSla';
@@ -20,19 +20,19 @@ const useToolbarFieldQueries = ({
   useProductGraphTallyQuery: useAliasProductGraphTallyQuery = useProductGraphTallyQuery
 } = {}) => {
   const {
-    [RHSM_API_QUERY_TYPES.BILLING_PROVIDER]: billingProvider,
-    [RHSM_API_QUERY_TYPES.SLA]: sla,
-    [RHSM_API_QUERY_TYPES.UOM]: uom,
-    [RHSM_API_QUERY_TYPES.USAGE]: usage
+    [RHSM_API_QUERY_SET_TYPES.BILLING_PROVIDER]: billingProvider,
+    [RHSM_API_QUERY_SET_TYPES.SLA]: sla,
+    [RHSM_API_QUERY_SET_TYPES.UOM]: uom,
+    [RHSM_API_QUERY_SET_TYPES.USAGE]: usage
   } = useAliasProductQuery();
-  const { [RHSM_API_QUERY_TYPES.GRANULARITY]: granularity } = useAliasProductGraphTallyQuery();
+  const { [RHSM_API_QUERY_SET_TYPES.GRANULARITY]: granularity } = useAliasProductGraphTallyQuery();
 
   return {
-    [RHSM_API_QUERY_TYPES.BILLING_PROVIDER]: billingProvider,
-    [RHSM_API_QUERY_TYPES.GRANULARITY]: granularity,
-    [RHSM_API_QUERY_TYPES.SLA]: sla,
-    [RHSM_API_QUERY_TYPES.UOM]: uom,
-    [RHSM_API_QUERY_TYPES.USAGE]: usage
+    [RHSM_API_QUERY_SET_TYPES.BILLING_PROVIDER]: billingProvider,
+    [RHSM_API_QUERY_SET_TYPES.GRANULARITY]: granularity,
+    [RHSM_API_QUERY_SET_TYPES.SLA]: sla,
+    [RHSM_API_QUERY_SET_TYPES.UOM]: uom,
+    [RHSM_API_QUERY_SET_TYPES.USAGE]: usage
   };
 };
 
@@ -56,13 +56,13 @@ const useToolbarFieldClear = ({
 
   return field => {
     switch (field) {
-      case RHSM_API_QUERY_TYPES.BILLING_PROVIDER:
+      case RHSM_API_QUERY_SET_TYPES.BILLING_PROVIDER:
         billingOnSelect();
         break;
-      case RHSM_API_QUERY_TYPES.SLA:
+      case RHSM_API_QUERY_SET_TYPES.SLA:
         slaOnSelect();
         break;
-      case RHSM_API_QUERY_TYPES.USAGE:
+      case RHSM_API_QUERY_SET_TYPES.USAGE:
         usageOnSelect();
         break;
       default:
@@ -90,9 +90,9 @@ const useToolbarFieldClearAll = ({
   useUsageOnSelect: useAliasUsageOnSelect = useUsageOnSelect
 } = {}) => {
   const {
-    [RHSM_API_QUERY_TYPES.BILLING_PROVIDER]: billingProvider,
-    [RHSM_API_QUERY_TYPES.SLA]: sla,
-    [RHSM_API_QUERY_TYPES.USAGE]: usage
+    [RHSM_API_QUERY_SET_TYPES.BILLING_PROVIDER]: billingProvider,
+    [RHSM_API_QUERY_SET_TYPES.SLA]: sla,
+    [RHSM_API_QUERY_SET_TYPES.USAGE]: usage
   } = useAliasProductQuery();
   const billingOnSelect = useAliasBillingProviderOnSelect();
   const slaOnSelect = useAliasSlaOnSelect();
diff --git a/src/components/toolbar/toolbarFieldDisplayName.js b/src/components/toolbar/toolbarFieldDisplayName.js
index cbffd8e90..030c13c37 100644
--- a/src/components/toolbar/toolbarFieldDisplayName.js
+++ b/src/components/toolbar/toolbarFieldDisplayName.js
@@ -5,7 +5,7 @@ import _debounce from 'lodash/debounce';
 import { reduxTypes, storeHooks } from '../../redux';
 import { useProduct, useProductInventoryHostsQuery } from '../productView/productViewContext';
 import { TextInput } from '../form/textInput';
-import { RHSM_API_QUERY_TYPES } from '../../types/rhsmApiTypes';
+import { RHSM_API_QUERY_SET_TYPES } from '../../services/rhsm/rhsmConstants';
 import { translate } from '../i18n/i18n';
 
 /**
@@ -31,7 +31,7 @@ const ToolbarFieldDisplayName = ({
   useProductInventoryHostsQuery: useAliasProductInventoryHostsQuery
 }) => {
   const { viewId } = useAliasProduct();
-  const { [RHSM_API_QUERY_TYPES.DISPLAY_NAME]: currentValue } = useAliasProductInventoryHostsQuery();
+  const { [RHSM_API_QUERY_SET_TYPES.DISPLAY_NAME]: currentValue } = useAliasProductInventoryHostsQuery();
   const dispatch = useAliasDispatch();
 
   /**
@@ -48,9 +48,9 @@ const ToolbarFieldDisplayName = ({
         viewId
       },
       {
-        type: reduxTypes.query.SET_QUERY_RHSM_HOSTS_INVENTORY_TYPES[RHSM_API_QUERY_TYPES.DISPLAY_NAME],
+        type: reduxTypes.query.SET_QUERY_RHSM_HOSTS_INVENTORY_TYPES[RHSM_API_QUERY_SET_TYPES.DISPLAY_NAME],
         viewId,
-        [RHSM_API_QUERY_TYPES.DISPLAY_NAME]: submitValue?.trim() || null
+        [RHSM_API_QUERY_SET_TYPES.DISPLAY_NAME]: submitValue?.trim() || null
       }
     ]);
 
@@ -71,9 +71,9 @@ const ToolbarFieldDisplayName = ({
         viewId
       },
       {
-        type: reduxTypes.query.SET_QUERY_RHSM_HOSTS_INVENTORY_TYPES[RHSM_API_QUERY_TYPES.DISPLAY_NAME],
+        type: reduxTypes.query.SET_QUERY_RHSM_HOSTS_INVENTORY_TYPES[RHSM_API_QUERY_SET_TYPES.DISPLAY_NAME],
         viewId,
-        [RHSM_API_QUERY_TYPES.DISPLAY_NAME]: null
+        [RHSM_API_QUERY_SET_TYPES.DISPLAY_NAME]: null
       }
     ]);
   };
diff --git a/src/components/toolbar/toolbarFieldGranularity.js b/src/components/toolbar/toolbarFieldGranularity.js
index db8f0c7a5..b8ca85350 100644
--- a/src/components/toolbar/toolbarFieldGranularity.js
+++ b/src/components/toolbar/toolbarFieldGranularity.js
@@ -3,7 +3,10 @@ import PropTypes from 'prop-types';
 import { reduxTypes, storeHooks } from '../../redux';
 import { useProduct, useProductGraphTallyQuery } from '../productView/productViewContext';
 import { Select, SelectPosition } from '../form/select';
-import { RHSM_API_QUERY_GRANULARITY_TYPES as FIELD_TYPES, RHSM_API_QUERY_TYPES } from '../../types/rhsmApiTypes';
+import {
+  RHSM_API_QUERY_GRANULARITY_TYPES as FIELD_TYPES,
+  RHSM_API_QUERY_SET_TYPES
+} from '../../services/rhsm/rhsmConstants';
 import { dateHelpers } from '../../common';
 import { translate } from '../i18n/i18n';
 
@@ -41,19 +44,19 @@ const useOnSelect = ({
         viewId
       },
       {
-        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.GRANULARITY],
+        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_SET_TYPES.GRANULARITY],
         viewId,
-        [RHSM_API_QUERY_TYPES.GRANULARITY]: value
+        [RHSM_API_QUERY_SET_TYPES.GRANULARITY]: value
       },
       {
-        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.START_DATE],
+        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_SET_TYPES.START_DATE],
         viewId,
-        [RHSM_API_QUERY_TYPES.START_DATE]: startDate.toISOString()
+        [RHSM_API_QUERY_SET_TYPES.START_DATE]: startDate.toISOString()
       },
       {
-        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.END_DATE],
+        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_SET_TYPES.END_DATE],
         viewId,
-        [RHSM_API_QUERY_TYPES.END_DATE]: endDate.toISOString()
+        [RHSM_API_QUERY_SET_TYPES.END_DATE]: endDate.toISOString()
       }
     ]);
   };
@@ -80,7 +83,7 @@ const ToolbarFieldGranularity = ({
   useOnSelect: useAliasOnSelect,
   useProductGraphTallyQuery: useAliasProductGraphTallyQuery
 }) => {
-  const { [RHSM_API_QUERY_TYPES.GRANULARITY]: updatedValue } = useAliasProductGraphTallyQuery();
+  const { [RHSM_API_QUERY_SET_TYPES.GRANULARITY]: updatedValue } = useAliasProductGraphTallyQuery();
   const onSelect = useAliasOnSelect();
   const updatedOptions = options.map(option => ({ ...option, selected: option.value === updatedValue }));
 
diff --git a/src/components/toolbar/toolbarFieldRangedMonthly.js b/src/components/toolbar/toolbarFieldRangedMonthly.js
index 6b9ba3958..862429da2 100644
--- a/src/components/toolbar/toolbarFieldRangedMonthly.js
+++ b/src/components/toolbar/toolbarFieldRangedMonthly.js
@@ -3,7 +3,10 @@ import PropTypes from 'prop-types';
 import { reduxTypes, storeHooks } from '../../redux';
 import { useProduct, useProductGraphTallyQuery } from '../productView/productViewContext';
 import { Select, SelectPosition } from '../form/select';
-import { RHSM_API_QUERY_GRANULARITY_TYPES as FIELD_TYPES, RHSM_API_QUERY_TYPES } from '../../types/rhsmApiTypes';
+import {
+  RHSM_API_QUERY_GRANULARITY_TYPES as FIELD_TYPES,
+  RHSM_API_QUERY_SET_TYPES
+} from '../../services/rhsm/rhsmConstants';
 import { dateHelpers } from '../../common';
 import { translate } from '../i18n/i18n';
 
@@ -40,19 +43,19 @@ const useOnSelect = ({
         viewId
       },
       {
-        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.GRANULARITY],
+        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_SET_TYPES.GRANULARITY],
         viewId,
-        [RHSM_API_QUERY_TYPES.GRANULARITY]: FIELD_TYPES.DAILY
+        [RHSM_API_QUERY_SET_TYPES.GRANULARITY]: FIELD_TYPES.DAILY
       },
       {
-        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.START_DATE],
+        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_SET_TYPES.START_DATE],
         viewId,
-        [RHSM_API_QUERY_TYPES.START_DATE]: startDate?.toISOString()
+        [RHSM_API_QUERY_SET_TYPES.START_DATE]: startDate?.toISOString()
       },
       {
-        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.END_DATE],
+        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_SET_TYPES.END_DATE],
         viewId,
-        [RHSM_API_QUERY_TYPES.END_DATE]: endDate?.toISOString()
+        [RHSM_API_QUERY_SET_TYPES.END_DATE]: endDate?.toISOString()
       }
     ]);
   };
@@ -79,7 +82,7 @@ const ToolbarFieldRangedMonthly = ({
   useOnSelect: useAliasOnSelect,
   useProductGraphTallyQuery: useAliasProductGraphTallyQuery
 }) => {
-  const { [RHSM_API_QUERY_TYPES.START_DATE]: updatedValue } = useAliasProductGraphTallyQuery();
+  const { [RHSM_API_QUERY_SET_TYPES.START_DATE]: updatedValue } = useAliasProductGraphTallyQuery();
   const onSelect = useAliasOnSelect();
 
   const updatedOptions = options.map(option => ({
diff --git a/src/components/toolbar/toolbarFieldSelectCategory.js b/src/components/toolbar/toolbarFieldSelectCategory.js
index f36490ec4..9fe70530a 100644
--- a/src/components/toolbar/toolbarFieldSelectCategory.js
+++ b/src/components/toolbar/toolbarFieldSelectCategory.js
@@ -5,7 +5,7 @@ import { useShallowCompareEffect } from 'react-use';
 import { reduxTypes, storeHooks } from '../../redux';
 import { useProduct, useProductToolbarConfig } from '../productView/productViewContext';
 import { Select } from '../form/select';
-import { RHSM_API_QUERY_SET_TYPES as RHSM_API_QUERY_TYPES } from '../../services/rhsm/rhsmConstants';
+import { RHSM_API_QUERY_SET_TYPES } from '../../services/rhsm/rhsmConstants';
 import { translate } from '../i18n/i18n';
 import { ToolbarFieldGranularity, toolbarFieldOptions as granularityOptions } from './toolbarFieldGranularity';
 import { ToolbarFieldRangedMonthly, toolbarFieldOptions as rangedMonthlyOptions } from './toolbarFieldRangedMonthly';
@@ -25,8 +25,8 @@ import { ToolbarFieldUsage, toolbarFieldOptions as usageOptions } from './toolba
  */
 const toolbarFieldOptions = [
   {
-    title: translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_TYPES.GRANULARITY }),
-    value: RHSM_API_QUERY_TYPES.GRANULARITY,
+    title: translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_SET_TYPES.GRANULARITY }),
+    value: RHSM_API_QUERY_SET_TYPES.GRANULARITY,
     component: function Granularity(props) {
       return <ToolbarFieldGranularity key="selectCategory_granularity" {...props} />;
     },
@@ -43,8 +43,8 @@ const toolbarFieldOptions = [
     isClearable: false
   },
   {
-    title: translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_TYPES.UOM }),
-    value: RHSM_API_QUERY_TYPES.UOM,
+    title: translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_SET_TYPES.UOM }),
+    value: RHSM_API_QUERY_SET_TYPES.UOM,
     component: function Uom(props) {
       return <ToolbarFieldUom key="selectCategory_uom" {...props} />;
     },
@@ -52,8 +52,8 @@ const toolbarFieldOptions = [
     isClearable: false
   },
   {
-    title: translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_TYPES.BILLING_PROVIDER }),
-    value: RHSM_API_QUERY_TYPES.BILLING_PROVIDER,
+    title: translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_SET_TYPES.BILLING_PROVIDER }),
+    value: RHSM_API_QUERY_SET_TYPES.BILLING_PROVIDER,
     component: function BillingProvider(props) {
       return <ToolbarFieldBillingProvider key="selectCategory_billingProvider" {...props} />;
     },
@@ -61,8 +61,8 @@ const toolbarFieldOptions = [
     isClearable: true
   },
   {
-    title: translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_TYPES.SLA }),
-    value: RHSM_API_QUERY_TYPES.SLA,
+    title: translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_SET_TYPES.SLA }),
+    value: RHSM_API_QUERY_SET_TYPES.SLA,
     component: function Sla(props) {
       return <ToolbarFieldSla key="selectCategory_sla" {...props} />;
     },
@@ -70,8 +70,8 @@ const toolbarFieldOptions = [
     isClearable: true
   },
   {
-    title: translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_TYPES.USAGE }),
-    value: RHSM_API_QUERY_TYPES.USAGE,
+    title: translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_SET_TYPES.USAGE }),
+    value: RHSM_API_QUERY_SET_TYPES.USAGE,
     component: function Usage(props) {
       return <ToolbarFieldUsage key="selectCategory_usage" {...props} />;
     },
diff --git a/src/components/toolbar/toolbarFieldSla.js b/src/components/toolbar/toolbarFieldSla.js
index 3e36984b0..ef5a8069d 100644
--- a/src/components/toolbar/toolbarFieldSla.js
+++ b/src/components/toolbar/toolbarFieldSla.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { reduxTypes, storeHooks } from '../../redux';
 import { useProduct, useProductQuery } from '../productView/productViewContext';
 import { Select, SelectPosition } from '../form/select';
-import { RHSM_API_QUERY_SLA_TYPES as FIELD_TYPES, RHSM_API_QUERY_TYPES } from '../../types/rhsmApiTypes';
+import { RHSM_API_QUERY_SLA_TYPES as FIELD_TYPES, RHSM_API_QUERY_SET_TYPES } from '../../services/rhsm/rhsmConstants';
 import { translate } from '../i18n/i18n';
 
 /**
@@ -39,9 +39,9 @@ const useOnSelect = ({
         viewId
       },
       {
-        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.SLA],
+        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_SET_TYPES.SLA],
         viewId,
-        [RHSM_API_QUERY_TYPES.SLA]: value
+        [RHSM_API_QUERY_SET_TYPES.SLA]: value
       }
     ]);
   };
@@ -68,7 +68,7 @@ const ToolbarFieldSla = ({
   useOnSelect: useAliasOnSelect,
   useProductQuery: useAliasProductQuery
 }) => {
-  const { [RHSM_API_QUERY_TYPES.SLA]: updatedValue } = useAliasProductQuery();
+  const { [RHSM_API_QUERY_SET_TYPES.SLA]: updatedValue } = useAliasProductQuery();
   const onSelect = useAliasOnSelect();
 
   const updatedOptions = options.map(option => ({ ...option, selected: option.value === updatedValue }));
diff --git a/src/components/toolbar/toolbarFieldUom.js b/src/components/toolbar/toolbarFieldUom.js
index a198bc999..032d94203 100644
--- a/src/components/toolbar/toolbarFieldUom.js
+++ b/src/components/toolbar/toolbarFieldUom.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { reduxTypes, storeHooks } from '../../redux';
 import { useProduct, useProductQuery } from '../productView/productViewContext';
 import { Select, SelectPosition } from '../form/select';
-import { RHSM_API_QUERY_UOM_TYPES as FIELD_TYPES, RHSM_API_QUERY_TYPES } from '../../types/rhsmApiTypes';
+import { RHSM_API_QUERY_UOM_TYPES as FIELD_TYPES, RHSM_API_QUERY_SET_TYPES } from '../../services/rhsm/rhsmConstants';
 import { translate } from '../i18n/i18n';
 
 /**
@@ -39,9 +39,9 @@ const useOnSelect = ({
         viewId
       },
       {
-        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.UOM],
+        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_SET_TYPES.UOM],
         viewId,
-        [RHSM_API_QUERY_TYPES.UOM]: value
+        [RHSM_API_QUERY_SET_TYPES.UOM]: value
       }
     ]);
 };
@@ -67,7 +67,7 @@ const ToolbarFieldUom = ({
   useOnSelect: useAliasOnSelect,
   useProductQuery: useAliasProductQuery
 }) => {
-  const { [RHSM_API_QUERY_TYPES.UOM]: updatedValue } = useAliasProductQuery();
+  const { [RHSM_API_QUERY_SET_TYPES.UOM]: updatedValue } = useAliasProductQuery();
   const onSelect = useAliasOnSelect();
 
   const updatedOptions = options.map(option => ({ ...option, selected: option.value === updatedValue }));
diff --git a/src/components/toolbar/toolbarFieldUsage.js b/src/components/toolbar/toolbarFieldUsage.js
index eda91a4ef..61d3d852a 100644
--- a/src/components/toolbar/toolbarFieldUsage.js
+++ b/src/components/toolbar/toolbarFieldUsage.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { reduxTypes, storeHooks } from '../../redux';
 import { useProduct, useProductQuery } from '../productView/productViewContext';
 import { Select, SelectPosition } from '../form/select';
-import { RHSM_API_QUERY_USAGE_TYPES as FIELD_TYPES, RHSM_API_QUERY_TYPES } from '../../types/rhsmApiTypes';
+import { RHSM_API_QUERY_USAGE_TYPES as FIELD_TYPES, RHSM_API_QUERY_SET_TYPES } from '../../services/rhsm/rhsmConstants';
 import { translate } from '../i18n/i18n';
 
 /**
@@ -39,9 +39,9 @@ const useOnSelect = ({
         viewId
       },
       {
-        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.USAGE],
+        type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_SET_TYPES.USAGE],
         viewId,
-        [RHSM_API_QUERY_TYPES.USAGE]: value
+        [RHSM_API_QUERY_SET_TYPES.USAGE]: value
       }
     ]);
 };
@@ -67,7 +67,7 @@ const ToolbarFieldUsage = ({
   useOnSelect: useAliasOnSelect,
   useProductQuery: useAliasProductQuery
 }) => {
-  const { [RHSM_API_QUERY_TYPES.USAGE]: updatedValue } = useAliasProductQuery();
+  const { [RHSM_API_QUERY_SET_TYPES.USAGE]: updatedValue } = useAliasProductQuery();
   const onSelect = useAliasOnSelect();
 
   const updatedOptions = options.map(option => ({ ...option, selected: option.value === updatedValue }));
diff --git a/src/config/routes.js b/src/config/routes.js
index 0f8971b67..f9267d875 100644
--- a/src/config/routes.js
+++ b/src/config/routes.js
@@ -6,16 +6,16 @@ import { config as rhacsConfig } from './product.rhacs';
 import { config as rhodsConfig } from './product.rhods';
 import { config as rhosakConfig } from './product.rhosak';
 import { config as satelliteProductConfig } from './product.satellite';
-import { RHSM_API_PATH_ID_TYPES } from '../types/rhsmApiTypes';
+import { RHSM_API_PATH_PRODUCT_TYPES } from '../services/rhsm/rhsmConstants';
 import { helpers } from '../common';
 
 const routes = [
   {
     id: 'rhel',
     path: '/rhel',
-    pathParameter: [RHSM_API_PATH_ID_TYPES.RHEL],
+    pathParameter: [RHSM_API_PATH_PRODUCT_TYPES.RHEL],
     productParameter: [rhelConfig.productGroup],
-    productConfig: [{ ...rhelConfig, productId: RHSM_API_PATH_ID_TYPES.RHEL }],
+    productConfig: [{ ...rhelConfig, productId: RHSM_API_PATH_PRODUCT_TYPES.RHEL }],
     redirect: null,
     isSearchable: true,
     aliases: ['insights'],
@@ -27,9 +27,9 @@ const routes = [
   {
     id: 'rhel-arm',
     path: '/rhel-arm',
-    pathParameter: [RHSM_API_PATH_ID_TYPES.RHEL_ARM],
+    pathParameter: [RHSM_API_PATH_PRODUCT_TYPES.RHEL_ARM],
     productParameter: [rhelConfig.productGroup],
-    productConfig: [{ ...rhelConfig, productId: RHSM_API_PATH_ID_TYPES.RHEL_ARM }],
+    productConfig: [{ ...rhelConfig, productId: RHSM_API_PATH_PRODUCT_TYPES.RHEL_ARM }],
     redirect: null,
     isSearchable: false,
     aliases: [],
@@ -41,9 +41,9 @@ const routes = [
   {
     id: 'rhel-ibmpower',
     path: '/rhel-ibmpower',
-    pathParameter: [RHSM_API_PATH_ID_TYPES.RHEL_IBM_POWER],
+    pathParameter: [RHSM_API_PATH_PRODUCT_TYPES.RHEL_IBM_POWER],
     productParameter: [rhelConfig.productGroup],
-    productConfig: [{ ...rhelConfig, productId: RHSM_API_PATH_ID_TYPES.RHEL_IBM_POWER }],
+    productConfig: [{ ...rhelConfig, productId: RHSM_API_PATH_PRODUCT_TYPES.RHEL_IBM_POWER }],
     redirect: null,
     isSearchable: false,
     aliases: [],
@@ -55,9 +55,9 @@ const routes = [
   {
     id: 'rhel-ibmz',
     path: '/rhel-ibmz',
-    pathParameter: [RHSM_API_PATH_ID_TYPES.RHEL_IBM_Z],
+    pathParameter: [RHSM_API_PATH_PRODUCT_TYPES.RHEL_IBM_Z],
     productParameter: [rhelConfig.productGroup],
-    productConfig: [{ ...rhelConfig, productId: RHSM_API_PATH_ID_TYPES.RHEL_IBM_Z }],
+    productConfig: [{ ...rhelConfig, productId: RHSM_API_PATH_PRODUCT_TYPES.RHEL_IBM_Z }],
     redirect: null,
     isSearchable: false,
     aliases: [],
@@ -69,9 +69,9 @@ const routes = [
   {
     id: 'rhel-x86',
     path: '/rhel-x86',
-    pathParameter: [RHSM_API_PATH_ID_TYPES.RHEL_X86],
+    pathParameter: [RHSM_API_PATH_PRODUCT_TYPES.RHEL_X86],
     productParameter: [rhelConfig.productGroup],
-    productConfig: [{ ...rhelConfig, productId: RHSM_API_PATH_ID_TYPES.RHEL_X86 }],
+    productConfig: [{ ...rhelConfig, productId: RHSM_API_PATH_PRODUCT_TYPES.RHEL_X86 }],
     redirect: null,
     isSearchable: false,
     aliases: [],
@@ -153,9 +153,9 @@ const routes = [
   {
     id: 'satellite',
     path: '/satellite',
-    pathParameter: [RHSM_API_PATH_ID_TYPES.SATELLITE],
+    pathParameter: [RHSM_API_PATH_PRODUCT_TYPES.SATELLITE],
     productParameter: [satelliteProductConfig.productGroup],
-    productConfig: [{ ...satelliteProductConfig, productId: RHSM_API_PATH_ID_TYPES.SATELLITE }],
+    productConfig: [{ ...satelliteProductConfig, productId: RHSM_API_PATH_PRODUCT_TYPES.SATELLITE }],
     redirect: null,
     isSearchable: true,
     aliases: [],
@@ -167,9 +167,9 @@ const routes = [
   {
     id: 'satellite-capsule',
     path: '/satellite-capsule',
-    pathParameter: [RHSM_API_PATH_ID_TYPES.SATELLITE_CAPSULE],
+    pathParameter: [RHSM_API_PATH_PRODUCT_TYPES.SATELLITE_CAPSULE],
     productParameter: [satelliteProductConfig.productGroup],
-    productConfig: [{ ...satelliteProductConfig, productId: RHSM_API_PATH_ID_TYPES.SATELLITE_CAPSULE }],
+    productConfig: [{ ...satelliteProductConfig, productId: RHSM_API_PATH_PRODUCT_TYPES.SATELLITE_CAPSULE }],
     redirect: null,
     isSearchable: false,
     aliases: [],
@@ -181,9 +181,9 @@ const routes = [
   {
     id: 'satellite-server',
     path: '/satellite-server',
-    pathParameter: [RHSM_API_PATH_ID_TYPES.SATELLITE_SERVER],
+    pathParameter: [RHSM_API_PATH_PRODUCT_TYPES.SATELLITE_SERVER],
     productParameter: [satelliteProductConfig.productGroup],
-    productConfig: [{ ...satelliteProductConfig, productId: RHSM_API_PATH_ID_TYPES.SATELLITE_SERVER }],
+    productConfig: [{ ...satelliteProductConfig, productId: RHSM_API_PATH_PRODUCT_TYPES.SATELLITE_SERVER }],
     redirect: null,
     isSearchable: false,
     aliases: [],
diff --git a/src/redux/actions/__tests__/rhsmActions.test.js b/src/redux/actions/__tests__/rhsmActions.test.js
index 8fa4940e3..949604be4 100644
--- a/src/redux/actions/__tests__/rhsmActions.test.js
+++ b/src/redux/actions/__tests__/rhsmActions.test.js
@@ -3,7 +3,7 @@ import { applyMiddleware, combineReducers, legacy_createStore as createStore } f
 import moxios from 'moxios';
 import { multiActionMiddleware } from '../../middleware/multiActionMiddleware';
 import { graphReducer, inventoryReducer, messagesReducer, viewReducer } from '../../reducers';
-import { rhsmApiTypes } from '../../../types/rhsmApiTypes';
+import { rhsmConstants } from '../../../services/rhsm/rhsmConstants';
 import { rhsmActions } from '../rhsmActions';
 
 describe('RhsmActions', () => {
@@ -28,7 +28,7 @@ describe('RhsmActions', () => {
       timeout: 1,
       response: {
         test: 'success',
-        [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA]: ['success']
+        [rhsmConstants.RHSM_API_RESPONSE_DATA]: ['success']
       }
     });
   });
diff --git a/src/redux/common/__tests__/reduxHelpers.test.js b/src/redux/common/__tests__/reduxHelpers.test.js
index 0db020c82..b6ada34c4 100644
--- a/src/redux/common/__tests__/reduxHelpers.test.js
+++ b/src/redux/common/__tests__/reduxHelpers.test.js
@@ -1,9 +1,9 @@
 import { reduxHelpers } from '../reduxHelpers';
 import {
   RHSM_API_QUERY_GRANULARITY_TYPES as GRANULARITY_TYPES,
-  RHSM_API_QUERY_TYPES,
-  RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES
-} from '../../../types/rhsmApiTypes';
+  RHSM_API_QUERY_SET_TYPES,
+  RHSM_API_QUERY_SET_TALLY_CAPACITY_TYPES
+} from '../../../services/rhsm/rhsmConstants';
 
 describe('ReduxHelpers', () => {
   it('should have specific functions', () => {
@@ -19,11 +19,11 @@ describe('ReduxHelpers', () => {
 
   it('should generate an expected API query with an existing schema', () => {
     const rhsmQuery = {
-      [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.DAILY,
-      [RHSM_API_QUERY_TYPES.LIMIT]: 10,
-      [RHSM_API_QUERY_TYPES.OFFSET]: 0
+      [RHSM_API_QUERY_SET_TYPES.GRANULARITY]: GRANULARITY_TYPES.DAILY,
+      [RHSM_API_QUERY_SET_TYPES.LIMIT]: 10,
+      [RHSM_API_QUERY_SET_TYPES.OFFSET]: 0
     };
-    expect(reduxHelpers.setApiQuery(rhsmQuery, RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES)).toMatchSnapshot('rhsm query');
+    expect(reduxHelpers.setApiQuery(rhsmQuery, RHSM_API_QUERY_SET_TALLY_CAPACITY_TYPES)).toMatchSnapshot('rhsm query');
   });
 
   it('should generate an expected API response with an existing schema', () => {
diff --git a/src/redux/common/apiQueries.js b/src/redux/common/apiQueries.js
index e05b00666..42404aa93 100644
--- a/src/redux/common/apiQueries.js
+++ b/src/redux/common/apiQueries.js
@@ -1,4 +1,4 @@
-import { rhsmApiTypes } from '../../types/rhsmApiTypes';
+import { rhsmConstants } from '../../services/rhsm/rhsmConstants';
 import { reduxHelpers } from './reduxHelpers';
 
 /**
@@ -12,15 +12,12 @@ import { reduxHelpers } from './reduxHelpers';
 const parseRhsmQuery = (query = {}, queries = {}) => {
   const { graphTallyQuery, inventoryGuestsQuery, inventoryHostsQuery, inventorySubscriptionsQuery } = queries;
 
-  const updatedGraphTallyQuery = reduxHelpers.setApiQuery(query, rhsmApiTypes.RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES);
-  const updatedInventoryGuestsQuery = reduxHelpers.setApiQuery(
-    query,
-    rhsmApiTypes.RHSM_API_QUERY_SET_INVENTORY_GUESTS_TYPES
-  );
-  const updatedInventoryHostsQuery = reduxHelpers.setApiQuery(query, rhsmApiTypes.RHSM_API_QUERY_SET_INVENTORY_TYPES);
+  const updatedGraphTallyQuery = reduxHelpers.setApiQuery(query, rhsmConstants.RHSM_API_QUERY_SET_TALLY_CAPACITY_TYPES);
+  const updatedInventoryGuestsQuery = reduxHelpers.setApiQuery(query, rhsmConstants.RHSM_API_QUERY_SET_INVENTORY_TYPES);
+  const updatedInventoryHostsQuery = reduxHelpers.setApiQuery(query, rhsmConstants.RHSM_API_QUERY_SET_INVENTORY_TYPES);
   const updatedInventorySubscriptionsQuery = reduxHelpers.setApiQuery(
     query,
-    rhsmApiTypes.RHSM_API_QUERY_SET_INVENTORY_TYPES
+    rhsmConstants.RHSM_API_QUERY_SET_INVENTORY_TYPES
   );
 
   return {
diff --git a/src/redux/reducers/userReducer.js b/src/redux/reducers/userReducer.js
index 69960fc40..c597e1ddb 100644
--- a/src/redux/reducers/userReducer.js
+++ b/src/redux/reducers/userReducer.js
@@ -1,6 +1,6 @@
 import _get from 'lodash/get';
 import { appTypes, platformTypes, userTypes } from '../types';
-import { rhsmApiTypes } from '../../types/rhsmApiTypes';
+import { rhsmConstants } from '../../services/rhsm/rhsmConstants';
 import { reduxHelpers } from '../common';
 
 /**
@@ -29,18 +29,14 @@ const userReducer = (state = initialState, action) => {
       const actionStatus = reduxHelpers.getStatusFromResults(action);
 
       if (actionStatus === 401 || actionStatus === 403) {
-        const errorCodes = _get(
-          reduxHelpers.getDataFromResults(action),
-          [rhsmApiTypes.RHSM_API_RESPONSE_ERROR_DATA],
-          []
-        );
+        const errorCodes = _get(reduxHelpers.getDataFromResults(action), [rhsmConstants.RHSM_API_RESPONSE_ERRORS], []);
 
         return reduxHelpers.setStateProp(
           'errors',
           {
             error: true,
             errorMessage: reduxHelpers.getMessageFromResults(action),
-            data: errorCodes.map(value => value[rhsmApiTypes.RHSM_API_RESPONSE_ERROR_DATA_TYPES.CODE]),
+            data: errorCodes.map(value => value[rhsmConstants.RHSM_API_RESPONSE_ERRORS_TYPES.CODE]),
             status: reduxHelpers.getStatusFromResults(action)
           },
           {