diff --git a/client/renderer/templates/25_exception_safe_public_functions.erb b/client/renderer/templates/25_exception_safe_private_functions.erb
similarity index 90%
rename from client/renderer/templates/25_exception_safe_public_functions.erb
rename to client/renderer/templates/25_exception_safe_private_functions.erb
index 94208b9..b929ae9 100644
--- a/client/renderer/templates/25_exception_safe_public_functions.erb
+++ b/client/renderer/templates/25_exception_safe_private_functions.erb
@@ -1,8 +1,8 @@
 --
--- Exception-safe public DataServices API function
+-- Exception-safe private DataServices API function
 --
 
-CREATE OR REPLACE FUNCTION <%= DATASERVICES_CLIENT_SCHEMA %>.<%= name %>_exception_safe (<%= params_with_type_and_default.join(' ,') %>)
+CREATE OR REPLACE FUNCTION <%= DATASERVICES_CLIENT_SCHEMA %>._<%= name %>_exception_safe (<%= params_with_type_and_default.join(' ,') %>)
 RETURNS <%= return_type %> AS $$
 DECLARE
   <% if not multi_row %>ret <%= return_type %>;<% end %>
diff --git a/client/renderer/templates/90_grant_execute.erb b/client/renderer/templates/90_grant_execute.erb
index bb00c6b..b6c797e 100644
--- a/client/renderer/templates/90_grant_execute.erb
+++ b/client/renderer/templates/90_grant_execute.erb
@@ -1,2 +1,2 @@
 GRANT EXECUTE ON FUNCTION <%= DATASERVICES_CLIENT_SCHEMA %>.<%= name %>(<%= params_with_type.join(', ') %>) TO publicuser;
-GRANT EXECUTE ON FUNCTION <%= DATASERVICES_CLIENT_SCHEMA %>.<%= name %>_exception_safe(<%= params_with_type.join(', ') %>) TO publicuser;
+GRANT EXECUTE ON FUNCTION <%= DATASERVICES_CLIENT_SCHEMA %>._<%= name %>_exception_safe(<%= params_with_type.join(', ') %>) TO publicuser;