1 files changed, 15 insertions, 6 deletions

diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index e3fdca9b129..2c00b5fe5f8 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -736,7 +736,7 @@ Slice::CsVisitor::writeDispatch(const ClassDefPtr& p)
                         }
                         else
                         {
-                            _out << nl << "return " << getUnqualified(fixId(cl->scoped() + "Disp_"), package)
+                            _out << nl << "return " << getUnqualified(cl, package, "", "Disp_")
                                  << ".iceD_" << opName << "(this, inS, current);";
                         }
                         break;
@@ -2196,6 +2196,17 @@ Slice::Gen::CompactIdVisitor::visitUnitEnd(const UnitPtr&)
 }
 
 bool
+Slice::Gen::CompactIdVisitor::visitModuleStart(const ModulePtr& p)
+{
+    return true;
+}
+
+void
+Slice::Gen::CompactIdVisitor::visitModuleEnd(const ModulePtr& p)
+{
+}
+
+bool
 Slice::Gen::CompactIdVisitor::visitClassDefStart(const ClassDefPtr& p)
 {
     if(p->compactId() >= 0)
@@ -3756,7 +3767,7 @@ Slice::Gen::ProxyVisitor::visitClassDefStart(const ClassDefPtr& p)
         ClassDefPtr def = *q;
         if(def->isInterface() || def->allOperations().size() > 0)
         {
-            baseInterfaces.push_back(getUnqualified(fixId((*q)->scoped() + "Prx"), package));
+            baseInterfaces.push_back(getUnqualified(*q, package, "", "Prx"));
         }
     }
 
@@ -4026,9 +4037,7 @@ Slice::Gen::OpsVisitor::visitClassDefStart(const ClassDefPtr& p)
                 {
                     first = false;
                 }
-                string s = (*q)->scoped();
-                s += "Operations";
-                _out << getUnqualified(fixId(s), package) << '_';
+                _out << getUnqualified(*q, package, "", "Operations_");
             }
             ++q;
         }
@@ -5037,7 +5046,7 @@ Slice::Gen::DispatcherVisitor::visitClassDefStart(const ClassDefPtr& p)
     string baseClass = getUnqualified("Ice.ObjectImpl", package);
     if(hasBaseClass && !bases.front()->allOperations().empty())
     {
-        baseClass = fixId(bases.front()->scoped() + "Disp_");
+        baseClass = getUnqualified(bases.front(), package, "", "Disp_");
     }
 
     _out << sp;