diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx
index 752135cf3..4d4f71079 100644
--- a/Source/Modules/r.cxx
+++ b/Source/Modules/r.cxx
@@ -1906,7 +1906,7 @@ int R::functionWrapper(Node *n) {
   int nargs;
 
   String *wname = Swig_name_wrapper(iname);
-  Replace(wname, "_wrap", "R_swig", DOH_REPLACE_FIRST);
+
   if(overname)
     Append(wname, overname);
   Setattr(n,"wrap:name", wname);
@@ -2924,6 +2924,9 @@ void R::main(int argc, char *argv[]) {
     }
     /// copyToR copyToC functions.
 
+    // Register the naming functions
+    Swig_name_register("wrapper", "R_swig_%f");
+
   }
 }