diff --git a/src/documentation/AllOrgRepos.md b/src/documentation/AllOrgRepos.md
index 509eeca..b8ea0aa 100644
--- a/src/documentation/AllOrgRepos.md
+++ b/src/documentation/AllOrgRepos.md
@@ -16,14 +16,14 @@ some of the examples below to play with these extra parameters.
 
 ```js
 import React, { useEffect, useState } from 'react';
-import { useAuthentication, useOrgApi } from 'dcs-react-hooks';
+import { useAuthentication, useOrgClient } from 'dcs-react-hooks';
 import ReactJson from 'react-json-view';
 
 function Component(){
   const { state: { token } } = useAuthentication({});
   const [ repos, setRepos] = useState([])
 
-  const orgClient = useOrgApi({token});
+  const orgClient = useOrgClient({token});
 
 // now get all the orgnizations
   useEffect(async () => {
diff --git a/src/documentation/AllOrgs.md b/src/documentation/AllOrgs.md
index a8843d3..d3e31ac 100644
--- a/src/documentation/AllOrgs.md
+++ b/src/documentation/AllOrgs.md
@@ -16,14 +16,14 @@ some of the examples below to play with these extra parameters.
 
 ```js
 import React, { useEffect, useState } from 'react';
-import { useAuthentication, useOrgApi } from 'dcs-react-hooks';
+import { useAuthentication, useOrgClient } from 'dcs-react-hooks';
 import ReactJson from 'react-json-view';
 
 function Component(){
   const { state: { token } } = useAuthentication({});
   const [ orgs, setOrgs] = useState([])
 
-  const orgClient = useOrgApi({token});
+  const orgClient = useOrgClient({token});
 
 // now get all the orgnizations
   useEffect(async () => {
diff --git a/src/documentation/useOrgApi.jsx b/src/documentation/useOrgClient.jsx
similarity index 94%
rename from src/documentation/useOrgApi.jsx
rename to src/documentation/useOrgClient.jsx
index 19a8996..adc4e0e 100644
--- a/src/documentation/useOrgApi.jsx
+++ b/src/documentation/useOrgClient.jsx
@@ -8,11 +8,11 @@ import { AxiosInstance } from "axios";
  * @param {string} config.token - Token needed to make secure requests.
  * @param {string} config.basePath - basePath to make the request
  */
-export function useOrgApi() {
+export function useOrgClient() {
   return <></>;
 };
 
-useOrgApi.propTypes = {
+useOrgClient.propTypes = {
   token: PropTypes.string,
   basePath: PropTypes.string,
   organizationClient: PropTypes.instanceOf(OrganizationApi),
diff --git a/src/documentation/useOrgApi.md b/src/documentation/useOrgClient.md
similarity index 78%
rename from src/documentation/useOrgApi.md
rename to src/documentation/useOrgClient.md
index 3e570fa..65b3711 100644
--- a/src/documentation/useOrgApi.md
+++ b/src/documentation/useOrgClient.md
@@ -1,12 +1,12 @@
-# useOrgApi
+# useOrgClient
 
 ```js
 import React, { useEffect, useState } from 'react';
-import { useOrgApi } from 'dcs-react-hooks';
+import { useOrgClient } from 'dcs-react-hooks';
 import ReactJson from 'react-json-view';
 
 function Component(){
-    const orgClient = useOrgApi({ basePath: "https://qa.door43.org/api/v1/" });
+    const orgClient = useOrgClient({ basePath: "https://qa.door43.org/api/v1/" });
     console.log("orgClient:", orgClient)
     const [org, setOrg] = useState({});
     useEffect(async () => {
diff --git a/src/documentation/useRepoApi.jsx b/src/documentation/useRepoClient.jsx
similarity index 94%
rename from src/documentation/useRepoApi.jsx
rename to src/documentation/useRepoClient.jsx
index e084811..dce1e73 100644
--- a/src/documentation/useRepoApi.jsx
+++ b/src/documentation/useRepoClient.jsx
@@ -9,11 +9,11 @@ import { AxiosInstance } from "axios";
  * @param {string} config.token - Token needed to make secure requests.
  * @param {string} config.basePath - basePath to make the request
  */
-export function useRepoApi() {
+export function useRepoClient() {
   return <></>;
 };
 
-useRepoApi.propTypes = {
+useRepoClient.propTypes = {
   token: PropTypes.string,
   basePath: PropTypes.string,
   repositoryClient: PropTypes.instanceOf(RepositoryApi),
diff --git a/src/documentation/useRepoApi.md b/src/documentation/useRepoClient.md
similarity index 78%
rename from src/documentation/useRepoApi.md
rename to src/documentation/useRepoClient.md
index b143070..9e03157 100644
--- a/src/documentation/useRepoApi.md
+++ b/src/documentation/useRepoClient.md
@@ -1,14 +1,14 @@
-# useRepoApi
+# useRepoClient
 
 @hook-description
 
 ```js
 import React, { useEffect, useState } from 'react';
-import { useRepoApi } from 'dcs-react-hooks';
+import { useRepoClient } from 'dcs-react-hooks';
 import ReactJson from 'react-json-view';
 
 function Component(){
-    const repositoryClient = useRepoApi({ basePath: "https://qa.door43.org/api/v1/" });
+    const repositoryClient = useRepoClient({ basePath: "https://qa.door43.org/api/v1/" });
     
     console.log(repositoryClient);
     
diff --git a/src/documentation/useUserApi.jsx b/src/documentation/useUserClient.jsx
similarity index 93%
rename from src/documentation/useUserApi.jsx
rename to src/documentation/useUserClient.jsx
index ecd1812..405124c 100644
--- a/src/documentation/useUserApi.jsx
+++ b/src/documentation/useUserClient.jsx
@@ -8,11 +8,11 @@ import { AxiosInstance } from "axios";
  * @param {string} config.username - The username
  * @param {string} config.password - The user password
  */
-export function useUserApi() {
+export function useUserClient() {
   return <></>;
 };
 
-useUserApi.propTypes = {
+useUserClient.propTypes = {
   token: PropTypes.string,
   basePath: PropTypes.string,
   userClient: PropTypes.instanceOf(UserApi),
diff --git a/src/documentation/useUserApi.md b/src/documentation/useUserClient.md
similarity index 83%
rename from src/documentation/useUserApi.md
rename to src/documentation/useUserClient.md
index 1c05fa1..a12ef48 100644
--- a/src/documentation/useUserApi.md
+++ b/src/documentation/useUserClient.md
@@ -4,11 +4,11 @@
 
 ```js
 import React, { useEffect, useState } from 'react';
-import { useUserApi } from 'dcs-react-hooks';
+import { useUserClient } from 'dcs-react-hooks';
 import ReactJson from 'react-json-view';
 
 function Component(){
-    const userClient = useUserApi({basePath: "https://qa.door43.org/api/v1/"});
+    const userClient = useUserClient({basePath: "https://qa.door43.org/api/v1/"});
     console.log(userClient);
 
     const [user, setUser] = useState({});
@@ -33,7 +33,7 @@ function Component(){
 
 ```js
 import React, { useEffect, useState } from 'react';
-import { useUserApi } from 'dcs-react-hooks';
+import { useUserClient } from 'dcs-react-hooks';
 import ReactJson from 'react-json-view';
 
 function Component(){
@@ -41,7 +41,7 @@ function Component(){
   const [username, setUsername] = useState();
   const [password, setPassword] = useState();
 
-  const userClient = useUserApi({basePath: "https://qa.door43.org/api/v1/", username, password});
+  const userClient = useUserClient({basePath: "https://qa.door43.org/api/v1/", username, password});
   console.log(userClient);
 
   useEffect(async () => {
diff --git a/src/hooks/api/index.js b/src/hooks/api/index.js
deleted file mode 100644
index 85d2434..0000000
--- a/src/hooks/api/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export * from "./useApiConfig"
-export * from "./useAdminApi"
-export * from "./useDcsApi"
-export * from "./useIssueApi"
-export * from "./useMiscellaneousApi"
-export * from "./useNotificationApi"
-export * from "./useOrgApi"
-export * from "./useRepoApi"
-export * from "./useSettingsApi"
-export * from "./useUserApi"
\ No newline at end of file
diff --git a/src/hooks/api/useApiConfig.js b/src/hooks/api/useApiConfig.js
deleted file mode 100644
index 1056110..0000000
--- a/src/hooks/api/useApiConfig.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export const useApiConfig = ({ token, basePath = "https://qa.door43.org/api/v1/", ...config }) => ({
-  apiKey: token && ((key) => key === "Authorization" ? `token ${token}` : ""),
-  basePath: basePath?.replace(/\/+$/, ""),
-  ...config
-})
diff --git a/src/hooks/calls/issues/useRepoIssues.js b/src/hooks/calls/issues/useRepoIssues.js
index 9ac0936..2f42a70 100644
--- a/src/hooks/calls/issues/useRepoIssues.js
+++ b/src/hooks/calls/issues/useRepoIssues.js
@@ -1,7 +1,7 @@
 import { useState } from "react";
 import useSWR from "swr";
 
-import useIssuesApi from "../../api/useIssueApi";
+import useIssuesApi from "../../clients/useIssueClient";
 
 function useRepoIssues({
   resource,
@@ -9,7 +9,7 @@ function useRepoIssues({
   args = {},
   paged = false,
 }) {
-  const issuesClient = useIssuesApi({ token });
+  const issuesClient = useIssuesClient({ token });
   const [isLoading, setIsLoading] = useState(false);
 
   function fetcher(owner, repo, defaultPage) {
diff --git a/src/hooks/calls/issues/useUserIssues.js b/src/hooks/calls/issues/useUserIssues.js
index 2dd03e6..25b872e 100644
--- a/src/hooks/calls/issues/useUserIssues.js
+++ b/src/hooks/calls/issues/useUserIssues.js
@@ -2,13 +2,13 @@ import PropTypes from "prop-types";
 import React, { useState } from "react";
 import useSWR from "swr";
 
-import useIssuesApi from "../useIssuesApi";
+import useIssuesApi from "../useIssuesClient";
 
 function useUserIssues({
   token,
   args = {},
 }) {
-  const issuesClient = useIssuesApi({ token });
+  const issuesClient = useIssuesClient({ token });
   const { data, error, mutate } = useSWR(
     token && [token, "user/issues"],
     () => {
diff --git a/src/hooks/calls/organization/useAllOrganizations.js b/src/hooks/calls/organization/useAllOrganizations.js
index 0629b96..5151e8c 100644
--- a/src/hooks/calls/organization/useAllOrganizations.js
+++ b/src/hooks/calls/organization/useAllOrganizations.js
@@ -1,11 +1,11 @@
 import useSwr from 'swr';
-import { useOrgApi } from '../../api/useOrgApi';
+import { useOrgClient } from '../../clients/useOrgClient';
 import { useAuthentication } from '../user/useAuthentication';
 
 export function useAllOrganizations({ organizationClient, options, configuration, axios }) {
   const { state: { token } } = useAuthentication({});
-  
-  const _organizationClient = useOrgApi({organizationClient, token: token?.sha1, ...configuration, axios});
+
+  const _organizationClient = useOrgClient({organizationClient, token: token?.sha1, ...configuration, axios});
 
   const fetchOrgs = () => {
     const organizations = _organizationClient.orgGetAll().then(({ data }) => data);
diff --git a/src/hooks/calls/organization/useOrganization.js b/src/hooks/calls/organization/useOrganization.js
index bec7e03..5160005 100644
--- a/src/hooks/calls/organization/useOrganization.js
+++ b/src/hooks/calls/organization/useOrganization.js
@@ -1,11 +1,11 @@
 import useSwr from 'swr';
-import { useOrgApi } from '../../api/useOrgApi';
+import { useOrgClient } from '../../clients/useOrgClient';
 import { useAuthentication } from '../user/useAuthentication';
 
 export function useOrganization({ organizationName, organizationClient, options, configuration, axios }) {
   const { state: { token } } = useAuthentication({});
   
-  const _organizationClient = useOrgApi({organizationClient, token: token?.sha1, ...configuration, axios});
+  const _organizationClient = useOrgClient({organizationClient, token: token?.sha1, ...configuration, axios});
 
   const fetchOrg = () => {
     const organization = _organizationClient.orgGet(organizationName).then(({ data }) => data);
diff --git a/src/hooks/calls/repository/useRepository.js b/src/hooks/calls/repository/useRepository.js
index 06083f6..f596376 100644
--- a/src/hooks/calls/repository/useRepository.js
+++ b/src/hooks/calls/repository/useRepository.js
@@ -1,9 +1,9 @@
 import useSwr from 'swr';
-import { useRepoApi } from '../../api/useRepoApi';
+import { useRepoClient } from '../../clients/useRepoClient';
 
 export function useRepository({ ownerName, repositoryName, repositoryClient, options, configuration, axios }) {
   
-  const _repositoryClient = useRepoApi({repositoryClient, ...configuration, axios});
+  const _repositoryClient = useRepoClient({ repositoryClient, ...configuration, axios });
 
   const fetchRepo = () => {
     const repository = _repositoryClient.repoGet(ownerName, repositoryName).then(({ data }) => data);
diff --git a/src/hooks/calls/user/useAuthentication.js b/src/hooks/calls/user/useAuthentication.js
index 91071a4..169f297 100644
--- a/src/hooks/calls/user/useAuthentication.js
+++ b/src/hooks/calls/user/useAuthentication.js
@@ -1,9 +1,9 @@
 import { useEffect } from 'react';
 import useSWRImmutable from 'swr/immutable'
-import { useUserApi } from "../../api/useUserApi";
+import { useUserClient } from "../../clients/useUserClient";
 
 export function useAuthentication({tokenName, username, password, userClient, options, configuration, axios}) {
-  const _userClient = useUserApi({ userClient, username, password, ...configuration, axios});
+  const _userClient = useUserClient({ userClient, username, password, ...configuration, axios});
 
   //Fetch function to get token and delete old ones
   const fetchAuth = async (username) => {
diff --git a/src/hooks/calls/user/useLogin.js b/src/hooks/calls/user/useLogin.js
index 39c2ff2..1ce1149 100644
--- a/src/hooks/calls/user/useLogin.js
+++ b/src/hooks/calls/user/useLogin.js
@@ -1,12 +1,12 @@
 import { useState } from "react";
 import useSWR from "swr";
 
-import { useUserApi } from "../../api/useUserApi";
+import { useUserApi } from "../../clients/useUserClient";
 
 export default function useLogin({tokenId}) {
   const [username, setUsername] = useState(undefined);
   const [password, setPassword] = useState(undefined);
-  const userClient = useUserApi({ username, password });
+  const userClient = useUserClient({ username, password });
 
   const fetchAuth = async (username) => {
     const allTokens = await userClient
diff --git a/src/hooks/calls/user/useUser.js b/src/hooks/calls/user/useUser.js
index 11708a3..e121333 100644
--- a/src/hooks/calls/user/useUser.js
+++ b/src/hooks/calls/user/useUser.js
@@ -1,10 +1,10 @@
 import { useState } from "react";
 import useSWR from "swr";
 
-import useUserApi from "../../api/useUserApi";
+import useUserApi from "../../clients/useUserClient";
 
 export default function useUser({ username, password }) {
-  const userClient = useUserApi({ username, password });
+  const userClient = useUserClient({ username, password });
 
   const fetchUser = () => {
     const user = userClient.userGetCurrent().then(({ data }) => data);
diff --git a/src/hooks/calls/user/useUserOrganizations.js b/src/hooks/calls/user/useUserOrganizations.js
index 782f67c..1c580fd 100644
--- a/src/hooks/calls/user/useUserOrganizations.js
+++ b/src/hooks/calls/user/useUserOrganizations.js
@@ -1,11 +1,11 @@
 import useSwr from 'swr';
-import { useOrgApi } from '../../api/useOrgApi';
+import { useOrgClient } from '../../clients/useOrgClient';
 import { useAuthentication } from '../user/useAuthentication';
 
 export function useUserOrganizations({ username, organizationClient, options, configuration, axios }) {
   const { state: { token } } = useAuthentication({});
 
-  const _organizationClient = useOrgApi({organizationClient, token: token?.sha1, ...configuration, axios});
+  const _organizationClient = useOrgClient({ organizationClient, token: token?.sha1, ...configuration, axios });
 
   const fetchUserOrg = () => {
     let orgList = [];
diff --git a/src/hooks/clients/index.js b/src/hooks/clients/index.js
new file mode 100644
index 0000000..ab82aaa
--- /dev/null
+++ b/src/hooks/clients/index.js
@@ -0,0 +1,9 @@
+export * from "./useAdminClient"
+export * from "./useDcsClient"
+export * from "./useIssueClient"
+export * from "./useMiscellaneousClient"
+export * from "./useNotificationClient"
+export * from "./useOrgClient"
+export * from "./useRepoClient"
+export * from "./useSettingsClient"
+export * from "./useUserClient"
\ No newline at end of file
diff --git a/src/hooks/api/useAdminApi.js b/src/hooks/clients/useAdminClient.js
similarity index 58%
rename from src/hooks/api/useAdminApi.js
rename to src/hooks/clients/useAdminClient.js
index 1314cc8..0592529 100644
--- a/src/hooks/api/useAdminApi.js
+++ b/src/hooks/clients/useAdminClient.js
@@ -1,12 +1,12 @@
 import { AdminApi } from "dcs-js";
-import { useApiConfig } from "./useApiConfig";
+import { getApiConfig } from "../../helpers/api";
 
 /**
  * Uses DCS admin API.
  * @param {string} token - Token needed to make secure requests.
  */
-export const useAdminApi = ({ token }) => {
-  const config = useApiConfig({ token });
+export const useAdminClient = ({ token }) => {
+  const config = getApiConfig({ token });
   const AdminClient = new AdminApi(config);
   return AdminClient;
 };
\ No newline at end of file
diff --git a/src/hooks/api/useDcsApi.js b/src/hooks/clients/useDcsClient.js
similarity index 53%
rename from src/hooks/api/useDcsApi.js
rename to src/hooks/clients/useDcsClient.js
index 9854027..ad261d3 100644
--- a/src/hooks/api/useDcsApi.js
+++ b/src/hooks/clients/useDcsClient.js
@@ -1,11 +1,11 @@
-import { useApiConfig } from "./useApiConfig";
+import { getApiConfig } from "../../helpers/api";
 
 /**
  * Uses DCS issues API.
  * @param {string} token - Token needed to make secure requests.
  */
-export const useDcsApi = ({ token, Class }) => {
-  const config = useApiConfig({ token });
+export const useDcsClient = ({ token, Class }) => {
+  const config = getApiConfig({ token });
   const client = Class ? new Class(config) : null;
   return client;
 };
diff --git a/src/hooks/api/useIssueApi.js b/src/hooks/clients/useIssueClient.js
similarity index 58%
rename from src/hooks/api/useIssueApi.js
rename to src/hooks/clients/useIssueClient.js
index 55e6595..6a50c98 100644
--- a/src/hooks/api/useIssueApi.js
+++ b/src/hooks/clients/useIssueClient.js
@@ -1,12 +1,12 @@
 import { IssueApi } from "dcs-js";
-import { useApiConfig } from "./useApiConfig";
+import { getApiConfig } from "../../helpers/api";
 
 /**
  * Uses DCS issue API.
  * @param {string} token - Token needed to make secure requests.
  */
-export const useIssuesApi = ({ token }) => {
-  const config = useApiConfig({ token });
+export const useIssuesClient = ({ token }) => {
+  const config = getApiConfig({ token });
   const issueClient = new IssueApi(config);
   return issueClient;
 };
diff --git a/src/hooks/api/useMiscellaneousApi.js b/src/hooks/clients/useMiscellaneousClient.js
similarity index 62%
rename from src/hooks/api/useMiscellaneousApi.js
rename to src/hooks/clients/useMiscellaneousClient.js
index f6fcffb..2e41b70 100644
--- a/src/hooks/api/useMiscellaneousApi.js
+++ b/src/hooks/clients/useMiscellaneousClient.js
@@ -1,12 +1,12 @@
 import { MiscellaneousApi } from "dcs-js";
-import { useApiConfig } from "./useApiConfig";
+import { getApiConfig } from "../../helpers/api";
 
 /**
  * Uses DCS Miscellaneous API.
  * @param {string} token - Token needed to make secure requests.
  */
-export const useMiscellaneousApi = ({ token }) => {
-  const config = useApiConfig({ token });
+export const useMiscellaneousClient = ({ token }) => {
+  const config = getApiConfig({ token });
   const MiscellaneousClient = new MiscellaneousApi(config);
   return MiscellaneousClient;
 };
\ No newline at end of file
diff --git a/src/hooks/api/useNotificationApi.js b/src/hooks/clients/useNotificationClient.js
similarity index 61%
rename from src/hooks/api/useNotificationApi.js
rename to src/hooks/clients/useNotificationClient.js
index 0022be9..24f9594 100644
--- a/src/hooks/api/useNotificationApi.js
+++ b/src/hooks/clients/useNotificationClient.js
@@ -1,12 +1,12 @@
 import { NotificationApi } from "dcs-js";
-import { useApiConfig } from "./useApiConfig";
+import { getApiConfig } from "../../helpers/api";
 
 /**
  * Uses DCS Notification API.
  * @param {string} token - Token needed to make secure requests.
  */
-export const useNotificationApi = ({ token }) => {
-  const config = useApiConfig({ token });
+export const useNotificationClient = ({ token }) => {
+  const config = getApiConfig({ token });
   const NotificationClient = new NotificationApi(config);
   return NotificationClient;
 };
diff --git a/src/hooks/api/useOrgApi.js b/src/hooks/clients/useOrgClient.js
similarity index 90%
rename from src/hooks/api/useOrgApi.js
rename to src/hooks/clients/useOrgClient.js
index 0682948..07380bb 100644
--- a/src/hooks/api/useOrgApi.js
+++ b/src/hooks/clients/useOrgClient.js
@@ -5,7 +5,7 @@ import { getApiConfig } from "../../helpers/api";
 
 /**
  * Uses DCS organization API.
- * @param {Object} params - useOrgApi parameters.
+ * @param {Object} params - useOrgClient parameters.
  * @param {string} params.token - Token needed to make secure requests.
  * @param {string} params.basePath - base route where the request will be sent.
  * @param {Object} params.organizationClient - OrganizationApi intance.
@@ -18,13 +18,13 @@ import { getApiConfig } from "../../helpers/api";
  * @param {string} configuration.basePath
  * @param {string} configuration.baseOptions
  */
-export const useOrgApi = ({ token, basePath, organizationClient, axios, configuration }) => {
+export const useOrgClient = ({ token, basePath, organizationClient, axios, configuration }) => {
   if (organizationClient instanceof OrganizationApi) return organizationClient;
   const _configuration = getApiConfig({ token, ...configuration, basePath });
   return new OrganizationApi(_configuration, _configuration.basePath, axios);
 };
 
-useOrgApi.propTypes = {
+useOrgClient.propTypes = {
   token: PropTypes.string,
   basePath: PropTypes.string,
   organizationClient: PropTypes.instanceOf(OrganizationApi),
diff --git a/src/hooks/api/useRepoApi.js b/src/hooks/clients/useRepoClient.js
similarity index 90%
rename from src/hooks/api/useRepoApi.js
rename to src/hooks/clients/useRepoClient.js
index e73b03f..da0b3f9 100644
--- a/src/hooks/api/useRepoApi.js
+++ b/src/hooks/clients/useRepoClient.js
@@ -5,7 +5,7 @@ import { getApiConfig } from "../../helpers/api";
 
 /**
  * Uses DCS repository API.
- * @param {Object} params - useOrgApi parameters.
+ * @param {Object} params - useOrgClient parameters.
  * @param {string} params.token - Token needed to make secure requests.
  * @param {string} params.basePath - base route where the request will be sent.
  * @param {Object} params.repositoryClient - repositoryApi intance.
@@ -18,13 +18,13 @@ import { getApiConfig } from "../../helpers/api";
  * @param {string} configuration.basePath
  * @param {string} configuration.baseOptions
  */
-export const useRepoApi = ({ token, basePath, repositoryClient, axios, configuration } = {}) => {
+export const useRepoClient = ({ token, basePath, repositoryClient, axios, configuration } = {}) => {
   if (repositoryClient instanceof RepositoryApi) return repositoryClient;
   const _configuration = getApiConfig({ token, ...configuration, basePath });
   return new RepositoryApi(_configuration, _configuration.basePath, axios);;
 };
 
-useRepoApi.propTypes = {
+useRepoClient.propTypes = {
   token: PropTypes.string,
   basePath: PropTypes.string,
   repositoryClient: PropTypes.instanceOf(RepositoryApi),
diff --git a/src/hooks/api/useSettingsApi.js b/src/hooks/clients/useSettingsClient.js
similarity index 60%
rename from src/hooks/api/useSettingsApi.js
rename to src/hooks/clients/useSettingsClient.js
index 3d98b5a..5c45018 100644
--- a/src/hooks/api/useSettingsApi.js
+++ b/src/hooks/clients/useSettingsClient.js
@@ -1,12 +1,12 @@
 import { SettingsApi } from "dcs-js";
-import { useApiConfig } from "./useApiConfig";
+import { getApiConfig } from "../../helpers/api";
 
 /**
  * Uses DCS Settings API.
  * @param {string} token - Token needed to make secure requests.
  */
-export const useSettingsApi = ({ token }) => {
-  const config = useApiConfig({ token });
+export const useSettingsClient = ({ token }) => {
+  const config = getApiConfig({ token });
   const SettingsClient = new SettingsApi(config);
   return SettingsClient;
 };
diff --git a/src/hooks/api/useUserApi.js b/src/hooks/clients/useUserClient.js
similarity index 89%
rename from src/hooks/api/useUserApi.js
rename to src/hooks/clients/useUserClient.js
index 43c2889..91af349 100644
--- a/src/hooks/api/useUserApi.js
+++ b/src/hooks/clients/useUserClient.js
@@ -7,13 +7,13 @@ import { getApiConfig } from "../../helpers/api";
  * @param {Object} config - Object containing information required for Basic authorization
  * 
  */
-export const useUserApi = ({ token, userClient, basePath, axios, ...configuration }) => {
+export const useUserClient = ({ token, userClient, basePath, axios, ...configuration }) => {
   if (userClient instanceof UserApi) return userClient;
   const _configuration = getApiConfig({ token, ...configuration, basePath });
   return new UserApi(_configuration, _configuration.basePath, axios);;
 };
 
-useUserApi.propTypes = {
+useUserClient.propTypes = {
   token: PropTypes.string,
   basePath: PropTypes.string,
   userClient: PropTypes.instanceOf(UserApi),
diff --git a/src/index.js b/src/index.js
index af09850..937c1ba 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,2 +1,2 @@
-export * from "./hooks/api"
+export * from "./hooks/clients"
 export * from "./hooks/calls"
\ No newline at end of file