diff --git a/ridlbe/c++11/templates/cli/hdr/ami/interface_amic_traits.erb b/ridlbe/c++11/templates/cli/hdr/ami/interface_amic_traits.erb
index 30b1b7ff..842409d2 100644
--- a/ridlbe/c++11/templates/cli/hdr/ami/interface_amic_traits.erb
+++ b/ridlbe/c++11/templates/cli/hdr/ami/interface_amic_traits.erb
@@ -1,27 +1,24 @@
 
 // generated from <%= ridl_template_path %>
-namespace IDL
+template <typename OStrm_>
+struct formatter<<%= amic_scoped_cxxtype %>, OStrm_>
 {
-  template <typename OStrm_>
-  struct formatter<<%= amic_scoped_cxxtype %>, OStrm_>
+  inline OStrm_& operator ()(OStrm_& os_, <%= amic_scoped_cxx_in_type %> val_)
   {
-    inline OStrm_& operator ()(OStrm_& os_, <%= amic_scoped_cxx_in_type %> val_)
-    {
-      os_ << IDL::traits<TAOX11_CORBA::Object>::_dump (std::move (val_), "<%= formatted_cxxname %>", true);
-      return os_;
-    }
-  };
-
-  template <typename OStrm_, typename Fmt>
-  inline OStrm_& operator <<(OStrm_& os, TAOX11_CORBA::amic_traits <<%= scoped_cxxtype %>>::__Writer<Fmt> w)
-  {
-    using writer_t = TAOX11_CORBA::amic_traits <<%= scoped_cxxtype %>>::__Writer<Fmt>;
-    using formatter_t = typename std::conditional<
-                          std::is_same<
-                            typename writer_t::formatter_t,
-                            std::false_type>::value,
-                          IDL::formatter<<%= amic_scoped_cxxtype %>, OStrm_>,
-                          typename writer_t::formatter_t>::type;
-    return TAOX11_CORBA::amic_traits <<%= scoped_cxxtype %>>::write_on (os, w.val_, formatter_t ());
+    os_ << IDL::traits<TAOX11_CORBA::Object>::_dump (std::move (val_), "<%= formatted_cxxname %>", true);
+    return os_;
   }
-} // namespace IDL
+};
+
+template <typename OStrm_, typename Fmt>
+inline OStrm_& operator <<(OStrm_& os, TAOX11_CORBA::amic_traits <<%= scoped_cxxtype %>>::__Writer<Fmt> w)
+{
+  using writer_t = TAOX11_CORBA::amic_traits <<%= scoped_cxxtype %>>::__Writer<Fmt>;
+  using formatter_t = typename std::conditional<
+                        std::is_same<
+                          typename writer_t::formatter_t,
+                          std::false_type>::value,
+                        IDL::formatter<<%= amic_scoped_cxxtype %>, OStrm_>,
+                        typename writer_t::formatter_t>::type;
+  return TAOX11_CORBA::amic_traits <<%= scoped_cxxtype %>>::write_on (os, w.val_, formatter_t ());
+}
diff --git a/ridlbe/c++11/templates/cli/prx/interface_pre.erb b/ridlbe/c++11/templates/cli/prx/interface_pre.erb
index 2022adcc..da87aae1 100644
--- a/ridlbe/c++11/templates/cli/prx/interface_pre.erb
+++ b/ridlbe/c++11/templates/cli/prx/interface_pre.erb
@@ -3,7 +3,7 @@
 class <%= stub_export_macro %><%= proxy_cxxname %>
 % if is_derived?
 %   if !has_concrete_base?
-    : public virtual <%= proxy_root_base %>
+  : public virtual <%= proxy_root_base %>
 %     _first = false
 %   else
 %     _first = true
@@ -13,7 +13,7 @@ class <%= stub_export_macro %><%= proxy_cxxname %>
 %     _first = false
 %   end
 % else
-    : public virtual <%= proxy_root_base %>
+  : public virtual <%= proxy_root_base %>
 % end
 {
 public:
diff --git a/ridlbe/c++11/writers/amistubheader.rb b/ridlbe/c++11/writers/amistubheader.rb
index 18f56820..9d1d50db 100644
--- a/ridlbe/c++11/writers/amistubheader.rb
+++ b/ridlbe/c++11/writers/amistubheader.rb
@@ -511,14 +511,14 @@ def initialize(output = STDOUT, opts = {})
       def pre_visit(_parser)
         println
         printiln('// generated from AmiStubHeaderAmicTraitsWriter#pre_visit')
-        printiln('namespace TAOX11_NAMESPACE')
+        printiln('namespace TAOX11_NAMESPACE::IDL')
         printiln('{')
         inc_nest
       end
 
       def post_visit(_parser)
         dec_nest
-        printiln('} // namespace TAOX11_NAMESPACE')
+        printiln('} // namespace TAOX11_NAMESPACE::IDL')
       end
 
       def enter_interface(node)
diff --git a/ridlbe/c++11/writers/amistubsource.rb b/ridlbe/c++11/writers/amistubsource.rb
index c45d6b83..09a45013 100644
--- a/ridlbe/c++11/writers/amistubsource.rb
+++ b/ridlbe/c++11/writers/amistubsource.rb
@@ -846,13 +846,13 @@ def pre_visit(parser)
         super
         println
         printiln('// generated from AmiStubSourceSArgTraitsWriter#pre_visit')
-        println('namespace TAOX11_NAMESPACE {')
+        println('namespace TAOX11_NAMESPACE::PS {')
         gen_exceptionholder_traits
       end
 
       def post_visit(parser)
         println
-        println('} // namespace TAOX11_NAMESPACE')
+        println('} // namespace TAOX11_NAMESPACE::PS')
         super
       end