diff --git a/interface/templates/grant-execute.erb b/interface/templates/client-grant-execute.erb
similarity index 100%
rename from interface/templates/grant-execute.erb
rename to interface/templates/client-grant-execute.erb
diff --git a/interface/templates/client-plproxy-function.erb b/interface/templates/client-plproxy-function.erb
new file mode 100644
index 0000000..f877f25
--- /dev/null
+++ b/interface/templates/client-plproxy-function.erb
@@ -0,0 +1,5 @@
+CREATE OR REPLACE FUNCTION <%= GEOCODER_CLIENT_SCHEMA %>._<%= signature['function_name'] %> (user_id name, tx_id bigint, <%= signature['argument_data_types'] %>)
+RETURNS Geometry AS $$
+  CONNECT <%= GEOCODER_CLIENT_SCHEMA %>._server_conn_str();
+  SELECT cdb_geocoder_server.<%= signature['function_name'] %> (user_id, tx_id, signature['argument_data_types']);
+$$ LANGUAGE plproxy;
diff --git a/interface/templates/public-function-definition.erb b/interface/templates/client-public-function.erb
similarity index 59%
rename from interface/templates/public-function-definition.erb
rename to interface/templates/client-public-function.erb
index 132beac..3d994b0 100644
--- a/interface/templates/public-function-definition.erb
+++ b/interface/templates/client-public-function.erb
@@ -15,10 +15,3 @@ BEGIN
 END;
 $$ LANGUAGE 'plpgsql' SECURITY DEFINER;
 
---------------------------------------------------------------------------------
-
-CREATE OR REPLACE FUNCTION <%= GEOCODER_CLIENT_SCHEMA %>._<%= signature['function_name'] %> (user_id name, tx_id bigint, <%= signature['argument_data_types'] %>)
-RETURNS Geometry AS $$
-  CONNECT <%= GEOCODER_CLIENT_SCHEMA %>._server_conn_str();
-  SELECT cdb_geocoder_server.<%= signature['function_name'] %> (user_id, tx_id, signature['argument_data_types']);
-$$ LANGUAGE plproxy;