diff --git a/lib/orogen/marshallers/corba.rb b/lib/orogen/marshallers/corba.rb
index 05a435d..b467da1 100644
--- a/lib/orogen/marshallers/corba.rb
+++ b/lib/orogen/marshallers/corba.rb
@@ -93,9 +93,9 @@ module Orocos
             if inlines_code?
                 normalize_cxxname(basename)
             elsif contains_opaques?
-                "orogen#{namespace('::')}Corba::#{normalize_cxxname(basename).gsub(/[^\w]/, '_')}_m"
+                "orogen::Corba::#{normalize_cxxname(basename).gsub(/[^\w]/, '_')}_m"
             else
-                "orogen#{namespace('::')}Corba::#{normalize_cxxname(basename).gsub(/[^\w]/, '_')}"
+                "orogen::Corba::#{normalize_cxxname(basename).gsub(/[^\w]/, '_')}"
             end
         end
 
@@ -170,8 +170,8 @@ module Orocos
                 "_CORBA_Unbounded_Sequence< #{deference.corba_name} >"
             end
         end
-        def corba_arg_type; "#{corba_name} const&" end
-        def corba_ref_type; "#{corba_name}&" end
+        def corba_arg_type; "#{corba_name(true)} const&" end
+        def corba_ref_type; "#{corba_name(true)}&" end
 
         def to_corba(typekit, result, indent)
             collection_name, element_type = container_kind, deference.name