diff --git a/src/controllers/rpc/about/index.js b/src/controllers/json-rpc/about/index.js
similarity index 100%
rename from src/controllers/rpc/about/index.js
rename to src/controllers/json-rpc/about/index.js
diff --git a/src/controllers/rpc/auth/index.js b/src/controllers/json-rpc/auth/index.js
similarity index 100%
rename from src/controllers/rpc/auth/index.js
rename to src/controllers/json-rpc/auth/index.js
diff --git a/src/controllers/rpc/index.js b/src/controllers/json-rpc/index.js
similarity index 100%
rename from src/controllers/rpc/index.js
rename to src/controllers/json-rpc/index.js
diff --git a/src/controllers/rpc/rate-limit.js b/src/controllers/json-rpc/rate-limit.js
similarity index 100%
rename from src/controllers/rpc/rate-limit.js
rename to src/controllers/json-rpc/rate-limit.js
diff --git a/src/controllers/rpc/users/index.js b/src/controllers/json-rpc/users/index.js
similarity index 100%
rename from src/controllers/rpc/users/index.js
rename to src/controllers/json-rpc/users/index.js
diff --git a/src/controllers/rpc/validators.js b/src/controllers/json-rpc/validators.js
similarity index 100%
rename from src/controllers/rpc/validators.js
rename to src/controllers/json-rpc/validators.js
diff --git a/src/lib/ipfs.js b/src/lib/ipfs.js
index 5dbbc4f..22c1df8 100644
--- a/src/lib/ipfs.js
+++ b/src/lib/ipfs.js
@@ -11,7 +11,7 @@ const BCHJS = require('@psf/bch-js')
 
 // Local libraries
 const config = require('../../config')
-const JSONRPC = require('../controllers/rpc')
+const JSONRPC = require('../controllers/json-rpc')
 
 class IPFSLib {
   constructor (localConfig) {
diff --git a/test/unit/biz-logic/a10-rpc.unit.js b/test/unit/biz-logic/a10-rpc.unit.js
index bdffbd5..f28752c 100644
--- a/test/unit/biz-logic/a10-rpc.unit.js
+++ b/test/unit/biz-logic/a10-rpc.unit.js
@@ -5,7 +5,7 @@
 // Public npm libraries
 const jsonrpc = require('jsonrpc-lite')
 
-const JSONRPC = require('../../../src/controllers/rpc')
+const JSONRPC = require('../../../src/controllers/json-rpc')
 
 describe('#JSON RPC', () => {
   let uut
diff --git a/test/unit/json-rpc/a10-rpc.unit.js b/test/unit/json-rpc/a10-rpc.unit.js
index 0d1d851..a439e0e 100644
--- a/test/unit/json-rpc/a10-rpc.unit.js
+++ b/test/unit/json-rpc/a10-rpc.unit.js
@@ -12,7 +12,7 @@ const { v4: uid } = require('uuid')
 process.env.SVC_ENV = 'test'
 
 // Local libraries.
-const JSONRPC = require('../../../src/controllers/rpc')
+const JSONRPC = require('../../../src/controllers/json-rpc')
 
 describe('#JSON RPC', () => {
   let uut
diff --git a/test/unit/json-rpc/a11-auth.unit.js b/test/unit/json-rpc/a11-auth.unit.js
index 3ec17c4..078e2dd 100644
--- a/test/unit/json-rpc/a11-auth.unit.js
+++ b/test/unit/json-rpc/a11-auth.unit.js
@@ -14,8 +14,8 @@ process.env.SVC_ENV = 'test'
 
 // Local libraries
 const config = require('../../../config')
-const AuthRPC = require('../../../src/controllers/rpc/auth')
-const RateLimit = require('../../../src/controllers/rpc/rate-limit')
+const AuthRPC = require('../../../src/controllers/json-rpc/auth')
+const RateLimit = require('../../../src/controllers/json-rpc/rate-limit')
 const UserLib = require('../../../src/lib/users')
 const userLib = new UserLib()
 
diff --git a/test/unit/json-rpc/a12-validators.unit.js b/test/unit/json-rpc/a12-validators.unit.js
index 341c2d8..45c956a 100644
--- a/test/unit/json-rpc/a12-validators.unit.js
+++ b/test/unit/json-rpc/a12-validators.unit.js
@@ -16,7 +16,7 @@ process.env.SVC_ENV = 'test'
 
 // Local libraries
 const config = require('../../../config')
-const Validators = require('../../../src/controllers/rpc/validators')
+const Validators = require('../../../src/controllers/json-rpc/validators')
 const UserLib = require('../../../src/lib/users')
 const userLib = new UserLib()
 
diff --git a/test/unit/json-rpc/a13-users.unit.js b/test/unit/json-rpc/a13-users.unit.js
index 693f95e..e8e9b1d 100644
--- a/test/unit/json-rpc/a13-users.unit.js
+++ b/test/unit/json-rpc/a13-users.unit.js
@@ -14,8 +14,8 @@ process.env.SVC_ENV = 'test'
 
 // Local libraries
 const config = require('../../../config')
-const UserRPC = require('../../../src/controllers/rpc/users')
-const RateLimit = require('../../../src/controllers/rpc/rate-limit')
+const UserRPC = require('../../../src/controllers/json-rpc/users')
+const RateLimit = require('../../../src/controllers/json-rpc/rate-limit')
 const UserModel = require('../../../src/models/users')
 
 describe('#UserRPC', () => {
diff --git a/test/unit/json-rpc/a14-rate-limits.js b/test/unit/json-rpc/a14-rate-limits.js
index 506f748..f1bf28b 100644
--- a/test/unit/json-rpc/a14-rate-limits.js
+++ b/test/unit/json-rpc/a14-rate-limits.js
@@ -12,7 +12,7 @@ const assert = require('chai').assert
 process.env.SVC_ENV = 'test'
 
 // Local libraries
-const RateLimit = require('../../../src/controllers/rpc/rate-limit')
+const RateLimit = require('../../../src/controllers/json-rpc/rate-limit')
 
 describe('#rate-limit', () => {
   let uut