diff --git a/modules/rpc/luasrc/controller/rpc.lua b/modules/rpc/luasrc/controller/rpc.lua
index 2a99075d2b..2eef7a0ebf 100644
--- a/modules/rpc/luasrc/controller/rpc.lua
+++ b/modules/rpc/luasrc/controller/rpc.lua
@@ -77,7 +77,7 @@ function rpc_uci()
 		luci.http.status(404, "Not Found")
 		return nil
 	end
-	local uci     = require "luci.controller.rpc.uci"
+	local uci     = require "luci.jsonrpcbind.uci"
 	local jsonrpc = require "luci.jsonrpc"
 	local http    = require "luci.http"
 	local ltn12   = require "luci.ltn12"
@@ -91,7 +91,7 @@ function rpc_uvl()
 		luci.http.status(404, "Not Found")
 		return nil
 	end
-	local uvl     = require "luci.controller.rpc.uvl"
+	local uvl     = require "luci.jsonrpcbind.uvl"
 	local jsonrpc = require "luci.jsonrpc"
 	local http    = require "luci.http"
 	local ltn12   = require "luci.ltn12"
diff --git a/modules/rpc/luasrc/controller/rpc/uci.lua b/modules/rpc/luasrc/jsonrpcbind/uci.lua
similarity index 100%
rename from modules/rpc/luasrc/controller/rpc/uci.lua
rename to modules/rpc/luasrc/jsonrpcbind/uci.lua
diff --git a/modules/rpc/luasrc/controller/rpc/uvl.lua b/modules/rpc/luasrc/jsonrpcbind/uvl.lua
similarity index 100%
rename from modules/rpc/luasrc/controller/rpc/uvl.lua
rename to modules/rpc/luasrc/jsonrpcbind/uvl.lua