diff --git a/cpp/include/Ice/MetricsObserverI.h b/cpp/include/Ice/MetricsObserverI.h
index d102f16fd41..113f781d562 100644
--- a/cpp/include/Ice/MetricsObserverI.h
+++ b/cpp/include/Ice/MetricsObserverI.h
@@ -652,7 +652,7 @@ class ObserverFactoryT : public Updater, private IceUtil::Mutex
     IceInternal::MetricsAdminIPtr _metrics;
     const std::string _name;
     MetricsMapSeqType _maps;
-    std::atomic<int> _enabled;
+    std::atomic<bool> _enabled;
     UpdaterPtr _updater;
 };
 
diff --git a/cpp/include/IceUtil/Shared.h b/cpp/include/IceUtil/Shared.h
index 8cefadd9bf3..74a1928fbc7 100644
--- a/cpp/include/IceUtil/Shared.h
+++ b/cpp/include/IceUtil/Shared.h
@@ -6,6 +6,7 @@
 #define ICE_UTIL_SHARED_H
 
 #include <IceUtil/Config.h>
+#include <atomic>
 
 //
 // Base classes for reference counted types. The IceUtil::Handle
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 07249842397..a82c71b184c 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -212,7 +212,7 @@ class Timer : public IceUtil::Timer
     virtual void runTimerTask(const IceUtil::TimerTaskPtr&);
 
     IceUtil::Mutex _mutex;
-    std::atomic<int> _hasObserver;
+    std::atomic<bool> _hasObserver;
     ObserverHelperT<Ice::Instrumentation::ThreadObserver> _observer;
 };
 
diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp
index db0481b7934..73f2ad60a47 100644
--- a/cpp/src/slice2cs/CsUtil.cpp
+++ b/cpp/src/slice2cs/CsUtil.cpp
@@ -2142,18 +2142,12 @@ Slice::CsGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
         StringList globalMetaData = dc->getMetaData();
         StringList newGlobalMetaData;
         static const string csPrefix = "cs:";
-        static const string clrPrefix = "clr:";
 
         for(StringList::iterator r = globalMetaData.begin(); r != globalMetaData.end(); ++r)
         {
             string& s = *r;
             string oldS = s;
 
-            if(s.find(clrPrefix) == 0)
-            {
-                s.replace(0, clrPrefix.size(), csPrefix);
-            }
-
             if(s.find(csPrefix) == 0)
             {
                 static const string csAttributePrefix = csPrefix + "attribute:";
@@ -2293,13 +2287,6 @@ Slice::CsGenerator::MetaDataVisitor::validate(const ContainedPtr& cont)
         string oldS = s;
 
         const string csPrefix = "cs:";
-        const string clrPrefix = "clr:";
-
-        if(s.find(clrPrefix) == 0)
-        {
-            s.replace(0, clrPrefix.size(), csPrefix);
-        }
-
         if(s.find(csPrefix) == 0)
         {
             SequencePtr seq = SequencePtr::dynamicCast(cont);
diff --git a/csharp/test/Ice/defaultValue/Test.ice b/csharp/test/Ice/defaultValue/Test.ice
index 5eb7435b673..14541716eca 100644
--- a/csharp/test/Ice/defaultValue/Test.ice
+++ b/csharp/test/Ice/defaultValue/Test.ice
@@ -101,7 +101,7 @@ struct Struct2
 // the string members, but we use metadata to force it to be mapped
 // to a class.
 //
-["clr:class"]
+["cs:class"]
 struct Struct3
 {
     bool boolFalse = false;
@@ -130,7 +130,7 @@ struct Struct3
 
 //
 // Struct4 would normally map to a C# struct because we have omitted
-// the string members, and don't contains clr:class metadata, but as it
+// the string members, and don't contains cs:class metadata, but as it
 // contains default values it is mapped to a class.
 //
 struct Struct4
@@ -221,7 +221,7 @@ exception DerivedEx extends BaseEx
     Nested::Color nc3 = ConstNestedColor3;
 }
 
-["clr:property"]
+["cs:property"]
 class ClassProperty
 {
     bool boolFalse = false;
@@ -242,7 +242,7 @@ class ClassProperty
     double zeroDotD = 0;
 }
 
-["clr:property"]
+["cs:property"]
 struct StructProperty
 {
     bool boolFalse = false;
@@ -264,10 +264,10 @@ struct StructProperty
 }
 
 //
-// Exceptions don't support "clr:property" metadata, but
+// Exceptions don't support "cs:property" metadata, but
 // we want to ensure that the generated code compiles.
 //
-["clr:property"]
+["cs:property"]
 exception ExceptionProperty
 {
     bool boolFalse = false;
diff --git a/csharp/test/Ice/dictMapping/Test.ice b/csharp/test/Ice/dictMapping/Test.ice
index 42ffbf95015..17dbd428fa2 100644
--- a/csharp/test/Ice/dictMapping/Test.ice
+++ b/csharp/test/Ice/dictMapping/Test.ice
@@ -20,10 +20,10 @@ struct TEstNv
 }
 
 sequence<int> AIS;
-["clr:generic:List"] sequence<int> GIS;
+["cs:generic:List"] sequence<int> GIS;
 
 sequence<string> ASS;
-["clr:generic:List"] sequence<string> GSS;
+["cs:generic:List"] sequence<string> GSS;
 
 dictionary<string, AIS> NDAIS;
 dictionary<string, GIS> NDGIS;
diff --git a/csharp/test/Ice/dictMapping/TestAMD.ice b/csharp/test/Ice/dictMapping/TestAMD.ice
index 8b322e92e56..efcc4562db8 100644
--- a/csharp/test/Ice/dictMapping/TestAMD.ice
+++ b/csharp/test/Ice/dictMapping/TestAMD.ice
@@ -14,10 +14,10 @@ dictionary<string, NV> NDV;
 dictionary<string, NR> NDR;
 
 sequence<int> AIS;
-["clr:generic:List"] sequence<int> GIS;
+["cs:generic:List"] sequence<int> GIS;
 
 sequence<string> ASS;
-["clr:generic:List"] sequence<string> GSS;
+["cs:generic:List"] sequence<string> GSS;
 
 dictionary<string, AIS> NDAIS;
 dictionary<string, GIS> NDGIS;
diff --git a/csharp/test/Ice/optional/Test.ice b/csharp/test/Ice/optional/Test.ice
index 6ca39483dfa..764daa232a0 100644
--- a/csharp/test/Ice/optional/Test.ice
+++ b/csharp/test/Ice/optional/Test.ice
@@ -34,7 +34,7 @@ struct VarStruct
     string m;
 }
 
-["clr:class"]
+["cs:class"]
 struct ClassVarStruct
 {
     int a;
@@ -50,9 +50,9 @@ sequence<double> DoubleSeq;
 sequence<string> StringSeq;
 sequence<MyEnum> MyEnumSeq;
 sequence<SmallStruct> SmallStructSeq;
-["clr:generic:List"] sequence<SmallStruct> SmallStructList;
+["cs:generic:List"] sequence<SmallStruct> SmallStructList;
 sequence<FixedStruct> FixedStructSeq;
-["clr:generic:LinkedList"] sequence<FixedStruct> FixedStructList;
+["cs:generic:LinkedList"] sequence<FixedStruct> FixedStructList;
 sequence<VarStruct> VarStructSeq;
 sequence<OneOptional> OneOptionalSeq;
 sequence<OneOptional*> OneOptionalPrxSeq;
@@ -150,7 +150,7 @@ exception RequiredException extends OptionalException
     OneOptional o2;
 }
 
-["clr:property"]
+["cs:property"]
 class OptionalWithCustom
 {
     optional(1) SmallStructList l;
diff --git a/csharp/test/Ice/optional/TestAMD.ice b/csharp/test/Ice/optional/TestAMD.ice
index 16581ea83e8..eb68b2bd9bb 100644
--- a/csharp/test/Ice/optional/TestAMD.ice
+++ b/csharp/test/Ice/optional/TestAMD.ice
@@ -34,7 +34,7 @@ struct VarStruct
     string m;
 }
 
-["clr:class"]
+["cs:class"]
 struct ClassVarStruct
 {
     int a;
@@ -50,9 +50,9 @@ sequence<double> DoubleSeq;
 sequence<string> StringSeq;
 sequence<MyEnum> MyEnumSeq;
 sequence<SmallStruct> SmallStructSeq;
-["clr:generic:List"] sequence<SmallStruct> SmallStructList;
+["cs:generic:List"] sequence<SmallStruct> SmallStructList;
 sequence<FixedStruct> FixedStructSeq;
-["clr:generic:LinkedList"] sequence<FixedStruct> FixedStructList;
+["cs:generic:LinkedList"] sequence<FixedStruct> FixedStructList;
 sequence<VarStruct> VarStructSeq;
 sequence<OneOptional> OneOptionalSeq;
 sequence<OneOptional*> OneOptionalPrxSeq;
@@ -150,7 +150,7 @@ exception RequiredException extends OptionalException
     OneOptional o2;
 }
 
-["clr:property"]
+["cs:property"]
 class OptionalWithCustom
 {
     optional(1) SmallStructList l;
diff --git a/csharp/test/Ice/seqMapping/Test.ice b/csharp/test/Ice/seqMapping/Test.ice
index e347f61f93c..ce05933636b 100644
--- a/csharp/test/Ice/seqMapping/Test.ice
+++ b/csharp/test/Ice/seqMapping/Test.ice
@@ -11,71 +11,71 @@ module Test
 {
 
 sequence<byte> AByteS;
-["clr:generic:List"] sequence<byte> LByteS;
-["clr:generic:LinkedList"] sequence<byte> KByteS;
-["clr:generic:Queue"] sequence<byte> QByteS;
-["clr:generic:Stack"] sequence<byte> SByteS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<byte> CByteS;
+["cs:generic:List"] sequence<byte> LByteS;
+["cs:generic:LinkedList"] sequence<byte> KByteS;
+["cs:generic:Queue"] sequence<byte> QByteS;
+["cs:generic:Stack"] sequence<byte> SByteS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<byte> CByteS;
 
 sequence<bool> ABoolS;
-["clr:generic:List"] sequence<bool> LBoolS;
-["clr:generic:LinkedList"] sequence<bool> KBoolS;
-["clr:generic:Queue"] sequence<bool> QBoolS;
-["clr:generic:Stack"] sequence<bool> SBoolS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<bool> CBoolS;
+["cs:generic:List"] sequence<bool> LBoolS;
+["cs:generic:LinkedList"] sequence<bool> KBoolS;
+["cs:generic:Queue"] sequence<bool> QBoolS;
+["cs:generic:Stack"] sequence<bool> SBoolS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<bool> CBoolS;
 
 sequence<short> AShortS;
-["clr:generic:List"] sequence<short> LShortS;
-["clr:generic:LinkedList"] sequence<short> KShortS;
-["clr:generic:Queue"] sequence<short> QShortS;
-["clr:generic:Stack"] sequence<short> SShortS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<short> CShortS;
+["cs:generic:List"] sequence<short> LShortS;
+["cs:generic:LinkedList"] sequence<short> KShortS;
+["cs:generic:Queue"] sequence<short> QShortS;
+["cs:generic:Stack"] sequence<short> SShortS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<short> CShortS;
 
 sequence<int> AIntS;
-["clr:generic:List"] sequence<int> LIntS;
-["clr:generic:LinkedList"] sequence<int> KIntS;
-["clr:generic:Queue"] sequence<int> QIntS;
-["clr:generic:Stack"] sequence<int> SIntS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<int> CIntS;
+["cs:generic:List"] sequence<int> LIntS;
+["cs:generic:LinkedList"] sequence<int> KIntS;
+["cs:generic:Queue"] sequence<int> QIntS;
+["cs:generic:Stack"] sequence<int> SIntS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<int> CIntS;
 
 sequence<long> ALongS;
-["clr:generic:List"] sequence<long> LLongS;
-["clr:generic:LinkedList"] sequence<long> KLongS;
-["clr:generic:Queue"] sequence<long> QLongS;
-["clr:generic:Stack"] sequence<long> SLongS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<long> CLongS;
+["cs:generic:List"] sequence<long> LLongS;
+["cs:generic:LinkedList"] sequence<long> KLongS;
+["cs:generic:Queue"] sequence<long> QLongS;
+["cs:generic:Stack"] sequence<long> SLongS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<long> CLongS;
 
 sequence<float> AFloatS;
-["clr:generic:List"] sequence<float> LFloatS;
-["clr:generic:LinkedList"] sequence<float> KFloatS;
-["clr:generic:Queue"] sequence<float> QFloatS;
-["clr:generic:Stack"] sequence<float> SFloatS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<float> CFloatS;
+["cs:generic:List"] sequence<float> LFloatS;
+["cs:generic:LinkedList"] sequence<float> KFloatS;
+["cs:generic:Queue"] sequence<float> QFloatS;
+["cs:generic:Stack"] sequence<float> SFloatS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<float> CFloatS;
 
 sequence<double> ADoubleS;
-["clr:generic:List"] sequence<double> LDoubleS;
-["clr:generic:LinkedList"] sequence<double> KDoubleS;
-["clr:generic:Queue"] sequence<double> QDoubleS;
-["clr:generic:Stack"] sequence<double> SDoubleS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<double> CDoubleS;
+["cs:generic:List"] sequence<double> LDoubleS;
+["cs:generic:LinkedList"] sequence<double> KDoubleS;
+["cs:generic:Queue"] sequence<double> QDoubleS;
+["cs:generic:Stack"] sequence<double> SDoubleS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<double> CDoubleS;
 
 sequence<string> AStringS;
-["clr:generic:List"] sequence<string> LStringS;
-["clr:generic:LinkedList"] sequence<string> KStringS;
-["clr:generic:Queue"] sequence<string> QStringS;
-["clr:generic:Stack"] sequence<string> SStringS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<string> CStringS;
+["cs:generic:List"] sequence<string> LStringS;
+["cs:generic:LinkedList"] sequence<string> KStringS;
+["cs:generic:Queue"] sequence<string> QStringS;
+["cs:generic:Stack"] sequence<string> SStringS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<string> CStringS;
 
 sequence<Object> AObjectS;
-["clr:generic:List"] sequence<Object> LObjectS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<Object> CObjectS;
+["cs:generic:List"] sequence<Object> LObjectS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<Object> CObjectS;
 
 sequence<Object*> AObjectPrxS;
-["clr:generic:List"] sequence<Object*> LObjectPrxS;
-["clr:generic:LinkedList"] sequence<Object*> KObjectPrxS;
-["clr:generic:Queue"] sequence<Object*> QObjectPrxS;
-["clr:generic:Stack"] sequence<Object*> SObjectPrxS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<Object*> CObjectPrxS;
+["cs:generic:List"] sequence<Object*> LObjectPrxS;
+["cs:generic:LinkedList"] sequence<Object*> KObjectPrxS;
+["cs:generic:Queue"] sequence<Object*> QObjectPrxS;
+["cs:generic:Stack"] sequence<Object*> SObjectPrxS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<Object*> CObjectPrxS;
 
 struct S
 {
@@ -83,11 +83,11 @@ struct S
 }
 
 sequence<S> AStructS;
-["clr:generic:List"] sequence<S> LStructS;
-["clr:generic:LinkedList"] sequence<S> KStructS;
-["clr:generic:Queue"] sequence<S> QStructS;
-["clr:generic:Stack"] sequence<S> SStructS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<S> CStructS;
+["cs:generic:List"] sequence<S> LStructS;
+["cs:generic:LinkedList"] sequence<S> KStructS;
+["cs:generic:Queue"] sequence<S> QStructS;
+["cs:generic:Stack"] sequence<S> SStructS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<S> CStructS;
 
 struct SD
 {
@@ -95,11 +95,11 @@ struct SD
 }
 
 sequence<SD> AStructSD;
-["clr:generic:List"] sequence<SD> LStructSD;
-["clr:generic:LinkedList"] sequence<SD> KStructSD;
-["clr:generic:Queue"] sequence<SD> QStructSD;
-["clr:generic:Stack"] sequence<SD> SStructSD;
-["clr:generic:Ice.seqMapping.Custom"] sequence<SD> CStructSD;
+["cs:generic:List"] sequence<SD> LStructSD;
+["cs:generic:LinkedList"] sequence<SD> KStructSD;
+["cs:generic:Queue"] sequence<SD> QStructSD;
+["cs:generic:Stack"] sequence<SD> SStructSD;
+["cs:generic:Ice.seqMapping.Custom"] sequence<SD> CStructSD;
 
 class CV
 {
@@ -107,15 +107,15 @@ class CV
 }
 
 sequence<CV> ACVS;
-["clr:generic:List"] sequence<CV> LCVS;
+["cs:generic:List"] sequence<CV> LCVS;
 
 interface I {}
 sequence<I*> AIPrxS;
-["clr:generic:List"] sequence<I*> LIPrxS;
-["clr:generic:LinkedList"] sequence<I*> KIPrxS;
-["clr:generic:Queue"] sequence<I*> QIPrxS;
-["clr:generic:Stack"] sequence<I*> SIPrxS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<I*> CIPrxS;
+["cs:generic:List"] sequence<I*> LIPrxS;
+["cs:generic:LinkedList"] sequence<I*> KIPrxS;
+["cs:generic:Queue"] sequence<I*> QIPrxS;
+["cs:generic:Stack"] sequence<I*> SIPrxS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<I*> CIPrxS;
 
 class CR
 {
@@ -123,23 +123,23 @@ class CR
 }
 
 sequence<CR> ACRS;
-["clr:generic:List"] sequence<CR> LCRS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<CR> CCRS;
+["cs:generic:List"] sequence<CR> LCRS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<CR> CCRS;
 
 enum En { A, B, C }
 
 sequence<En> AEnS;
-["clr:generic:List"] sequence<En> LEnS;
-["clr:generic:LinkedList"] sequence<En> KEnS;
-["clr:generic:Queue"] sequence<En> QEnS;
-["clr:generic:Stack"] sequence<En> SEnS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<En> CEnS;
+["cs:generic:List"] sequence<En> LEnS;
+["cs:generic:LinkedList"] sequence<En> KEnS;
+["cs:generic:Queue"] sequence<En> QEnS;
+["cs:generic:Stack"] sequence<En> SEnS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<En> CEnS;
 
-["clr:generic:Ice.seqMapping.Custom"] sequence<int> CustomIntS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<CV> CustomCVS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<int> CustomIntS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<CV> CustomCVS;
 
-["clr:generic:Ice.seqMapping.Custom"] sequence<CustomIntS> CustomIntSS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<CustomCVS> CustomCVSS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<CustomIntS> CustomIntSS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<CustomCVS> CustomCVSS;
 
 interface MyClass
 {
diff --git a/csharp/test/Ice/seqMapping/TestAMD.ice b/csharp/test/Ice/seqMapping/TestAMD.ice
index fc007ee7f44..adbacfa131b 100644
--- a/csharp/test/Ice/seqMapping/TestAMD.ice
+++ b/csharp/test/Ice/seqMapping/TestAMD.ice
@@ -11,61 +11,61 @@ module Test
 {
 
 sequence<byte> AByteS;
-["clr:generic:List"] sequence<byte> LByteS;
-["clr:generic:LinkedList"] sequence<byte> KByteS;
-["clr:generic:Queue"] sequence<byte> QByteS;
-["clr:generic:Stack"] sequence<byte> SByteS;
+["cs:generic:List"] sequence<byte> LByteS;
+["cs:generic:LinkedList"] sequence<byte> KByteS;
+["cs:generic:Queue"] sequence<byte> QByteS;
+["cs:generic:Stack"] sequence<byte> SByteS;
 
 sequence<bool> ABoolS;
-["clr:generic:List"] sequence<bool> LBoolS;
-["clr:generic:LinkedList"] sequence<bool> KBoolS;
-["clr:generic:Queue"] sequence<bool> QBoolS;
-["clr:generic:Stack"] sequence<bool> SBoolS;
+["cs:generic:List"] sequence<bool> LBoolS;
+["cs:generic:LinkedList"] sequence<bool> KBoolS;
+["cs:generic:Queue"] sequence<bool> QBoolS;
+["cs:generic:Stack"] sequence<bool> SBoolS;
 
 sequence<short> AShortS;
-["clr:generic:List"] sequence<short> LShortS;
-["clr:generic:LinkedList"] sequence<short> KShortS;
-["clr:generic:Queue"] sequence<short> QShortS;
-["clr:generic:Stack"] sequence<short> SShortS;
+["cs:generic:List"] sequence<short> LShortS;
+["cs:generic:LinkedList"] sequence<short> KShortS;
+["cs:generic:Queue"] sequence<short> QShortS;
+["cs:generic:Stack"] sequence<short> SShortS;
 
 sequence<int> AIntS;
-["clr:generic:List"] sequence<int> LIntS;
-["clr:generic:LinkedList"] sequence<int> KIntS;
-["clr:generic:Queue"] sequence<int> QIntS;
-["clr:generic:Stack"] sequence<int> SIntS;
+["cs:generic:List"] sequence<int> LIntS;
+["cs:generic:LinkedList"] sequence<int> KIntS;
+["cs:generic:Queue"] sequence<int> QIntS;
+["cs:generic:Stack"] sequence<int> SIntS;
 
 sequence<long> ALongS;
-["clr:generic:List"] sequence<long> LLongS;
-["clr:generic:LinkedList"] sequence<long> KLongS;
-["clr:generic:Queue"] sequence<long> QLongS;
-["clr:generic:Stack"] sequence<long> SLongS;
+["cs:generic:List"] sequence<long> LLongS;
+["cs:generic:LinkedList"] sequence<long> KLongS;
+["cs:generic:Queue"] sequence<long> QLongS;
+["cs:generic:Stack"] sequence<long> SLongS;
 
 sequence<float> AFloatS;
-["clr:generic:List"] sequence<float> LFloatS;
-["clr:generic:LinkedList"] sequence<float> KFloatS;
-["clr:generic:Queue"] sequence<float> QFloatS;
-["clr:generic:Stack"] sequence<float> SFloatS;
+["cs:generic:List"] sequence<float> LFloatS;
+["cs:generic:LinkedList"] sequence<float> KFloatS;
+["cs:generic:Queue"] sequence<float> QFloatS;
+["cs:generic:Stack"] sequence<float> SFloatS;
 
 sequence<double> ADoubleS;
-["clr:generic:List"] sequence<double> LDoubleS;
-["clr:generic:LinkedList"] sequence<double> KDoubleS;
-["clr:generic:Queue"] sequence<double> QDoubleS;
-["clr:generic:Stack"] sequence<double> SDoubleS;
+["cs:generic:List"] sequence<double> LDoubleS;
+["cs:generic:LinkedList"] sequence<double> KDoubleS;
+["cs:generic:Queue"] sequence<double> QDoubleS;
+["cs:generic:Stack"] sequence<double> SDoubleS;
 
 sequence<string> AStringS;
-["clr:generic:List"] sequence<string> LStringS;
-["clr:generic:LinkedList"] sequence<string> KStringS;
-["clr:generic:Queue"] sequence<string> QStringS;
-["clr:generic:Stack"] sequence<string> SStringS;
+["cs:generic:List"] sequence<string> LStringS;
+["cs:generic:LinkedList"] sequence<string> KStringS;
+["cs:generic:Queue"] sequence<string> QStringS;
+["cs:generic:Stack"] sequence<string> SStringS;
 
 sequence<Object> AObjectS;
-["clr:generic:List"] sequence<Object> LObjectS;
+["cs:generic:List"] sequence<Object> LObjectS;
 
 sequence<Object*> AObjectPrxS;
-["clr:generic:List"] sequence<Object*> LObjectPrxS;
-["clr:generic:LinkedList"] sequence<Object*> KObjectPrxS;
-["clr:generic:Queue"] sequence<Object*> QObjectPrxS;
-["clr:generic:Stack"] sequence<Object*> SObjectPrxS;
+["cs:generic:List"] sequence<Object*> LObjectPrxS;
+["cs:generic:LinkedList"] sequence<Object*> KObjectPrxS;
+["cs:generic:Queue"] sequence<Object*> QObjectPrxS;
+["cs:generic:Stack"] sequence<Object*> SObjectPrxS;
 
 struct S
 {
@@ -73,10 +73,10 @@ struct S
 }
 
 sequence<S> AStructS;
-["clr:generic:List"] sequence<S> LStructS;
-["clr:generic:LinkedList"] sequence<S> KStructS;
-["clr:generic:Queue"] sequence<S> QStructS;
-["clr:generic:Stack"] sequence<S> SStructS;
+["cs:generic:List"] sequence<S> LStructS;
+["cs:generic:LinkedList"] sequence<S> KStructS;
+["cs:generic:Queue"] sequence<S> QStructS;
+["cs:generic:Stack"] sequence<S> SStructS;
 
 struct SD
 {
@@ -84,10 +84,10 @@ struct SD
 }
 
 sequence<SD> AStructSD;
-["clr:generic:List"] sequence<SD> LStructSD;
-["clr:generic:LinkedList"] sequence<SD> KStructSD;
-["clr:generic:Queue"] sequence<SD> QStructSD;
-["clr:generic:Stack"] sequence<SD> SStructSD;
+["cs:generic:List"] sequence<SD> LStructSD;
+["cs:generic:LinkedList"] sequence<SD> KStructSD;
+["cs:generic:Queue"] sequence<SD> QStructSD;
+["cs:generic:Stack"] sequence<SD> SStructSD;
 
 class CV
 {
@@ -95,14 +95,14 @@ class CV
 }
 
 sequence<CV> ACVS;
-["clr:generic:List"] sequence<CV> LCVS;
+["cs:generic:List"] sequence<CV> LCVS;
 
 interface I {}
 sequence<I*> AIPrxS;
-["clr:generic:List"] sequence<I*> LIPrxS;
-["clr:generic:LinkedList"] sequence<I*> KIPrxS;
-["clr:generic:Queue"] sequence<I*> QIPrxS;
-["clr:generic:Stack"] sequence<I*> SIPrxS;
+["cs:generic:List"] sequence<I*> LIPrxS;
+["cs:generic:LinkedList"] sequence<I*> KIPrxS;
+["cs:generic:Queue"] sequence<I*> QIPrxS;
+["cs:generic:Stack"] sequence<I*> SIPrxS;
 
 class CR
 {
@@ -110,21 +110,21 @@ class CR
 }
 
 sequence<CR> ACRS;
-["clr:generic:List"] sequence<CR> LCRS;
+["cs:generic:List"] sequence<CR> LCRS;
 
 enum En { A, B, C }
 
 sequence<En> AEnS;
-["clr:generic:List"] sequence<En> LEnS;
-["clr:generic:LinkedList"] sequence<En> KEnS;
-["clr:generic:Queue"] sequence<En> QEnS;
-["clr:generic:Stack"] sequence<En> SEnS;
+["cs:generic:List"] sequence<En> LEnS;
+["cs:generic:LinkedList"] sequence<En> KEnS;
+["cs:generic:Queue"] sequence<En> QEnS;
+["cs:generic:Stack"] sequence<En> SEnS;
 
-["clr:generic:Ice.seqMapping.Custom"] sequence<int> CustomIntS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<CV> CustomCVS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<int> CustomIntS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<CV> CustomCVS;
 
-["clr:generic:Ice.seqMapping.Custom"] sequence<CustomIntS> CustomIntSS;
-["clr:generic:Ice.seqMapping.Custom"] sequence<CustomCVS> CustomCVSS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<CustomIntS> CustomIntSS;
+["cs:generic:Ice.seqMapping.Custom"] sequence<CustomCVS> CustomCVSS;
 
 ["amd"] interface MyClass
 {
diff --git a/csharp/test/Ice/stream/Test.ice b/csharp/test/Ice/stream/Test.ice
index 7b40d076e29..707708cd03f 100644
--- a/csharp/test/Ice/stream/Test.ice
+++ b/csharp/test/Ice/stream/Test.ice
@@ -69,39 +69,39 @@ dictionary<long, float> LongFloatD;
 dictionary<string, string> StringStringD;
 dictionary<string, MyClass> StringMyClassD;
 
-["clr:generic:List"]
+["cs:generic:List"]
 sequence<bool> BoolList;
-["clr:generic:List"]
+["cs:generic:List"]
 sequence<byte> ByteList;
-["clr:generic:List"]
+["cs:generic:List"]
 sequence<MyEnum> MyEnumList;
-["clr:generic:List"]
+["cs:generic:List"]
 sequence<SmallStruct> SmallStructList;
-["clr:generic:List"]
+["cs:generic:List"]
 sequence<MyClass> MyClassList;
-["clr:generic:List"]
+["cs:generic:List"]
 sequence<MyClass*> MyClassProxyList;
-["clr:generic:List"]
+["cs:generic:List"]
 sequence<MyInterface*> MyInterfaceProxyList;
 
-["clr:generic:LinkedList"]
+["cs:generic:LinkedList"]
 sequence<short> ShortLinkedList;
-["clr:generic:LinkedList"]
+["cs:generic:LinkedList"]
 sequence<int> IntLinkedList;
-["clr:generic:LinkedList"]
+["cs:generic:LinkedList"]
 sequence<MyEnum> MyEnumLinkedList;
-["clr:generic:LinkedList"]
+["cs:generic:LinkedList"]
 sequence<SmallStruct> SmallStructLinkedList;
 
-["clr:generic:Stack"]
+["cs:generic:Stack"]
 sequence<long> LongStack;
-["clr:generic:Stack"]
+["cs:generic:Stack"]
 sequence<float> FloatStack;
-["clr:generic:Stack"]
+["cs:generic:Stack"]
 sequence<SmallStruct> SmallStructStack;
-["clr:generic:Stack"]
+["cs:generic:Stack"]
 sequence<MyClass*> MyClassProxyStack;
-["clr:generic:Stack"]
+["cs:generic:Stack"]
 sequence<MyInterface*> MyInterfaceProxyStack;
 
 //
@@ -109,7 +109,7 @@ sequence<MyInterface*> MyInterfaceProxyStack;
 // sequence mapping. The generic:Stack metadata cannot be use
 // with object sequences.
 //
-["clr:generic:Stack"]
+["cs:generic:Stack"]
 sequence<Object> ObjectStack;
 
 //
@@ -117,7 +117,7 @@ sequence<Object> ObjectStack;
 // sequence mapping. The generic:Stack metadata cannot be use
 // with object sequences.
 //
-["clr:generic:Stack"]
+["cs:generic:Stack"]
 sequence<MyClass> MyClassStack;
 
 //
@@ -125,22 +125,22 @@ sequence<MyClass> MyClassStack;
 // sequence mapping. The generic:Stack metadata cannot be use
 // with object sequences.
 //
-["clr:generic:Stack"]
+["cs:generic:Stack"]
 sequence<MyInterface> MyInterfaceStack;
 
-["clr:generic:Queue"]
+["cs:generic:Queue"]
 sequence<double> DoubleQueue;
-["clr:generic:Queue"]
+["cs:generic:Queue"]
 sequence<string> StringQueue;
-["clr:generic:Queue"]
+["cs:generic:Queue"]
 sequence<SmallStruct> SmallStructQueue;
 
-["clr:generic:List"]
+["cs:generic:List"]
 sequence<Ice::StringSeq> StringSList;
-["clr:generic:Stack"]
+["cs:generic:Stack"]
 sequence<Ice::StringSeq> StringSStack;
 
-["clr:generic:SortedDictionary"]
+["cs:generic:SortedDictionary"]
 dictionary<string, string> SortedStringStringD;
 
 class MyClass
diff --git a/csharp/test/Slice/structure/Test.ice b/csharp/test/Slice/structure/Test.ice
index b33e9cc2be4..c704d7f0562 100644
--- a/csharp/test/Slice/structure/Test.ice
+++ b/csharp/test/Slice/structure/Test.ice
@@ -14,7 +14,7 @@ class C
     int i;
 }
 
-["clr:class"]
+["cs:class"]
 struct S1
 {
     string name;
diff --git a/slice/Ice/Communicator.ice b/slice/Ice/Communicator.ice
index 5e1aa0293cb..f733cc46b7d 100644
--- a/slice/Ice/Communicator.ice
+++ b/slice/Ice/Communicator.ice
@@ -47,7 +47,7 @@ module Ice
 /// @see ObjectAdapter
 /// @see Properties
 /// @see ValueFactory
-["clr:implements:global::System.IDisposable", "java:implements:java.lang.AutoCloseable"]
+["cs:implements:global::System.IDisposable", "java:implements:java.lang.AutoCloseable"]
 
 #if !defined(__SLICE2PHP__) && !defined(__SLICE2MATLAB__)
 local interface Communicator
diff --git a/swift/test/Ice/optional/TestAMD.ice b/swift/test/Ice/optional/TestAMD.ice
index b55117f39ae..76632e35f14 100644
--- a/swift/test/Ice/optional/TestAMD.ice
+++ b/swift/test/Ice/optional/TestAMD.ice
@@ -35,7 +35,7 @@ struct VarStruct
     string m;
 }
 
-["clr:class"]
+["cs:class"]
 struct ClassVarStruct
 {
     int a;
@@ -51,14 +51,14 @@ sequence<double> DoubleSeq;
 sequence<string> StringSeq;
 sequence<MyEnum> MyEnumSeq;
 sequence<SmallStruct> SmallStructSeq;
-["clr:generic:List"] sequence<SmallStruct> SmallStructList;
+["cs:generic:List"] sequence<SmallStruct> SmallStructList;
 sequence<FixedStruct> FixedStructSeq;
-["clr:generic:LinkedList"] sequence<FixedStruct> FixedStructList;
+["cs:generic:LinkedList"] sequence<FixedStruct> FixedStructList;
 sequence<VarStruct> VarStructSeq;
 sequence<OneOptional> OneOptionalSeq;
 sequence<OneOptional*> OneOptionalPrxSeq;
 
-["clr:serializable:Ice.optional.Test.SerializableClass"]
+["cs:serializable:Ice.optional.Test.SerializableClass"]
 sequence<byte> Serializable;
 
 dictionary<int, int> IntIntDict;
@@ -156,7 +156,7 @@ exception RequiredException extends OptionalException
     OneOptional o2;
 }
 
-["clr:property"]
+["cs:property"]
 class OptionalWithCustom
 {
     optional(1) SmallStructList l;