diff --git a/README b/README
index 4a5b539d..80125e62 100644
--- a/README
+++ b/README
@@ -2,14 +2,14 @@ Directory structure
 -------------------
 
 src/
-  Mono.VisualC.Interop
+  Mono.Cxxi
     The runtime library
   generator
     The binding generator
   qt
     Auto generated Qt bindings + test program
 
-tests2/
+tests/
   Regression tests
 
 examples/
diff --git a/configure.ac b/configure.ac
index b19df681..0cc545ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.54])
-AC_INIT([CPPInterop], [0.99.1])
+AC_INIT([Mono.Cxxi], [0.99.1])
 AM_INIT_AUTOMAKE([foreign])
 AM_MAINTAINER_MODE
 
@@ -57,8 +57,8 @@ dnl package checks, per config
 
 
 AC_CONFIG_FILES([
-src/Mono.VisualC.Interop/mono.visualc.interop.pc
-src/Mono.VisualC.Interop/Makefile
+src/Mono.Cxxi/mono.cxxi.pc
+src/Mono.Cxxi/Makefile
 src/QtBindings/qtbindings.pc
 src/QtBindings/Makefile
 src/generator/generator
diff --git a/CPPInterop.sln b/cxxi.sln
similarity index 91%
rename from CPPInterop.sln
rename to cxxi.sln
index 13f8c073..48d32160 100644
--- a/CPPInterop.sln
+++ b/cxxi.sln
@@ -1,7 +1,7 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.VisualC.Interop", "src\Mono.VisualC.Interop\Mono.VisualC.Interop.csproj", "{4A864586-93C5-4DC1-8A80-F094A88506D7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cxxi", "src\Mono.Cxxi\Mono.Cxxi.csproj", "{4A864586-93C5-4DC1-8A80-F094A88506D7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "tests\Tests.csproj", "{3C290CBE-CA39-47F6-B3A0-ACD16C5A38C8}"
 EndProject
diff --git a/examples/Hello/Hello.cs b/examples/Hello/Hello.cs
index 0a03ae94..6a168487 100644
--- a/examples/Hello/Hello.cs
+++ b/examples/Hello/Hello.cs
@@ -1,5 +1,4 @@
 using System;
-using Mono.VisualC.Interop;
 
 public class HelloExample
 {
diff --git a/examples/Hello/Makefile.am b/examples/Hello/Makefile.am
index 1163a838..a57b518f 100644
--- a/examples/Hello/Makefile.am
+++ b/examples/Hello/Makefile.am
@@ -10,7 +10,7 @@ BUILD_DIR=$(top_srcdir)/bin/Release
 endif
 
 INTEROP_DLL = \
-	$(BUILD_DIR)/Mono.VisualC.Interop.dll
+	$(BUILD_DIR)/Mono.Cxxi.dll
 
 HELLO_EXE = \
 	$(BUILD_DIR)/Hello.exe
diff --git a/src/Makefile.am b/src/Makefile.am
index 1391d887..bd1fa8b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,2 +1,2 @@
 
- SUBDIRS =  Mono.VisualC.Interop generator
+ SUBDIRS =  Mono.Cxxi generator
diff --git a/src/Mono.VisualC.Interop/ABI/CppAbi.cs b/src/Mono.Cxxi/Abi/CppAbi.cs
similarity index 96%
rename from src/Mono.VisualC.Interop/ABI/CppAbi.cs
rename to src/Mono.Cxxi/Abi/CppAbi.cs
index a1d3055c..45981f8a 100644
--- a/src/Mono.VisualC.Interop/ABI/CppAbi.cs
+++ b/src/Mono.Cxxi/Abi/CppAbi.cs
@@ -1,11 +1,29 @@
 //
-// Mono.VisualC.Interop.ABI.CppAbi.cs: Represents an abstract C++ ABI
+// Mono.Cxxi.Abi.CppAbi.cs: Represents an abstract C++ ABI
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 using System;
 using System.Linq;
@@ -16,9 +34,9 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
 
-using Mono.VisualC.Interop.Util;
+using Mono.Cxxi.Util;
 
-namespace Mono.VisualC.Interop.ABI {
+namespace Mono.Cxxi.Abi {
 
 	//FIXME: Exception handling, operator overloading etc.
 	//FIXME: Allow interface to override default calling convention
diff --git a/src/Mono.VisualC.Interop/ABI/Impl/ItaniumAbi.cs b/src/Mono.Cxxi/Abi/Impl/ItaniumAbi.cs
similarity index 97%
rename from src/Mono.VisualC.Interop/ABI/Impl/ItaniumAbi.cs
rename to src/Mono.Cxxi/Abi/Impl/ItaniumAbi.cs
index 46f0301b..d88ae71f 100644
--- a/src/Mono.VisualC.Interop/ABI/Impl/ItaniumAbi.cs
+++ b/src/Mono.Cxxi/Abi/Impl/ItaniumAbi.cs
@@ -1,11 +1,11 @@
 //
-// Mono.VisualC.Interop.ABI.ItaniumAbi.cs: An implementation of the Itanium C++ ABI
+// Mono.Cxxi.Abi.ItaniumAbi.cs: An implementation of the Itanium C++ ABI
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -34,9 +34,9 @@ using System.Reflection.Emit;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
-using Mono.VisualC.Interop.Util;
+using Mono.Cxxi.Util;
 
-namespace Mono.VisualC.Interop.ABI {
+namespace Mono.Cxxi.Abi {
 	public class ItaniumAbi : CppAbi {
 
 		public static readonly ItaniumAbi Instance = new ItaniumAbi ();
diff --git a/src/Mono.VisualC.Interop/ABI/Impl/ItaniumTypeInfo.cs b/src/Mono.Cxxi/Abi/Impl/ItaniumTypeInfo.cs
similarity index 95%
rename from src/Mono.VisualC.Interop/ABI/Impl/ItaniumTypeInfo.cs
rename to src/Mono.Cxxi/Abi/Impl/ItaniumTypeInfo.cs
index 701c2203..03184c41 100644
--- a/src/Mono.VisualC.Interop/ABI/Impl/ItaniumTypeInfo.cs
+++ b/src/Mono.Cxxi/Abi/Impl/ItaniumTypeInfo.cs
@@ -1,3 +1,6 @@
+//
+// Mono.Cxxi.Abi.ItaniumTypeInfo.cs: An implementation of the Itanium C++ ABI
+//
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //
@@ -28,9 +31,9 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Reflection;
 
-using Mono.VisualC.Interop.Util;
+using Mono.Cxxi.Util;
 
-namespace Mono.VisualC.Interop.ABI {
+namespace Mono.Cxxi.Abi {
 
 	public class ItaniumTypeInfo : CppTypeInfo {
 		public ItaniumTypeInfo (ItaniumAbi abi, IEnumerable<PInvokeSignature> virtualMethods, Type nativeLayout, Type wrapperType)
diff --git a/src/Mono.VisualC.Interop/ABI/Impl/MsvcAbi.cs b/src/Mono.Cxxi/Abi/Impl/MsvcAbi.cs
similarity index 96%
rename from src/Mono.VisualC.Interop/ABI/Impl/MsvcAbi.cs
rename to src/Mono.Cxxi/Abi/Impl/MsvcAbi.cs
index 4615b733..85883e26 100644
--- a/src/Mono.VisualC.Interop/ABI/Impl/MsvcAbi.cs
+++ b/src/Mono.Cxxi/Abi/Impl/MsvcAbi.cs
@@ -1,11 +1,11 @@
 //
-// Mono.VisualC.Interop.ABI.MsvcAbi.cs: An implementation of the Microsoft Visual C++ ABI
+// Mono.Cxxi.Abi.MsvcAbi.cs: An implementation of the Microsoft Visual C++ ABI
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -33,10 +33,10 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
-using Mono.VisualC.Interop;
-using Mono.VisualC.Interop.Util;
+using Mono.Cxxi;
+using Mono.Cxxi.Util;
 
-namespace Mono.VisualC.Interop.ABI {
+namespace Mono.Cxxi.Abi {
 
 	// FIXME: No 64-bit support
 	public class MsvcAbi : CppAbi {
diff --git a/src/Mono.VisualC.Interop/ABI/Impl/VirtualOnlyAbi.cs b/src/Mono.Cxxi/Abi/Impl/VirtualOnlyAbi.cs
similarity index 92%
rename from src/Mono.VisualC.Interop/ABI/Impl/VirtualOnlyAbi.cs
rename to src/Mono.Cxxi/Abi/Impl/VirtualOnlyAbi.cs
index 0e9e85ad..f6cf7d8f 100644
--- a/src/Mono.VisualC.Interop/ABI/Impl/VirtualOnlyAbi.cs
+++ b/src/Mono.Cxxi/Abi/Impl/VirtualOnlyAbi.cs
@@ -1,11 +1,11 @@
 //
-// Mono.VisualC.Interop.ABI.VirtualOnlyAbi.cs: A generalized C++ ABI that only supports virtual methods
+// Mono.Cxxi.Abi.VirtualOnlyAbi.cs: A generalized C++ ABI that only supports virtual methods
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -31,7 +31,7 @@ using System.Reflection;
 using System.Reflection.Emit;
 using System.Runtime.InteropServices;
 
-namespace Mono.VisualC.Interop.ABI {
+namespace Mono.Cxxi.Abi {
 
 	public class VirtualOnlyAbi : CppAbi {
 
diff --git a/src/Mono.VisualC.Interop/ABI/MethodType.cs b/src/Mono.Cxxi/Abi/MethodType.cs
similarity index 90%
rename from src/Mono.VisualC.Interop/ABI/MethodType.cs
rename to src/Mono.Cxxi/Abi/MethodType.cs
index fe52866a..dc393b85 100644
--- a/src/Mono.VisualC.Interop/ABI/MethodType.cs
+++ b/src/Mono.Cxxi/Abi/MethodType.cs
@@ -1,8 +1,11 @@
+//
+// Mono.Cxxi.Abi.MethodType.cs: Method annotation for IL codegen
+//
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -24,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 using System;
-namespace Mono.VisualC.Interop {
+namespace Mono.Cxxi.Abi {
 	public enum MethodType {
 		NoOp,
 		NotImplemented,
diff --git a/src/Mono.VisualC.Interop/ABI/VTable.cs b/src/Mono.Cxxi/Abi/VTable.cs
similarity index 97%
rename from src/Mono.VisualC.Interop/ABI/VTable.cs
rename to src/Mono.Cxxi/Abi/VTable.cs
index 4f2f258d..fb4f1a1e 100644
--- a/src/Mono.VisualC.Interop/ABI/VTable.cs
+++ b/src/Mono.Cxxi/Abi/VTable.cs
@@ -1,11 +1,11 @@
 //
-// Mono.VisualC.Interop.ABI.VTable.cs: abstract vtable
+// Mono.Cxxi.Abi.VTable.cs: Managed VTable Implementation
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 // 
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -34,7 +34,7 @@ using System.Reflection;
 using System.Reflection.Emit;
 using System.Runtime.InteropServices;
 
-namespace Mono.VisualC.Interop.ABI {
+namespace Mono.Cxxi.Abi {
 
 	// TODO: RTTI .. support virtual inheritance
 
diff --git a/src/Mono.VisualC.Interop/AssemblyInfo.cs b/src/Mono.Cxxi/AssemblyInfo.cs
similarity index 93%
rename from src/Mono.VisualC.Interop/AssemblyInfo.cs
rename to src/Mono.Cxxi/AssemblyInfo.cs
index 37abde95..22fe6da6 100644
--- a/src/Mono.VisualC.Interop/AssemblyInfo.cs
+++ b/src/Mono.Cxxi/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -23,10 +23,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-
-// AssemblyInfo.cs created with MonoDevelop
-// User: alex at 21:36 03/13/2009
-//
 using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -34,7 +30,7 @@ using System.Runtime.CompilerServices;
 // Information about this assembly is defined by the following attributes.
 // Change them to the values specific to your project.
 
-[assembly: AssemblyTitle("Mono.VisualC.Interop")]
+[assembly: AssemblyTitle("Mono.Cxxi")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
diff --git a/src/Mono.VisualC.Interop/Attributes.cs b/src/Mono.Cxxi/Attributes.cs
similarity index 97%
rename from src/Mono.VisualC.Interop/Attributes.cs
rename to src/Mono.Cxxi/Attributes.cs
index 7240d515..10cd5283 100644
--- a/src/Mono.VisualC.Interop/Attributes.cs
+++ b/src/Mono.Cxxi/Attributes.cs
@@ -1,5 +1,5 @@
 //
-// Mono.VisualC.Interop.Attributes.cs
+// Mono.Cxxi.Attributes.cs
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
@@ -11,7 +11,7 @@ using System;
 using System.Linq;
 using System.Reflection;
 
-namespace Mono.VisualC.Interop {
+namespace Mono.Cxxi {
 
 	#region Interface method attributes
 
@@ -99,8 +99,8 @@ namespace Mono.VisualC.Interop {
 	#endregion
 }
 
-namespace Mono.VisualC.Interop.ABI {
-using Mono.VisualC.Interop;
+namespace Mono.Cxxi.Abi {
+using Mono.Cxxi;
 
 	public partial class CppAbi {
 
diff --git a/src/Mono.VisualC.Interop/CppField.cs b/src/Mono.Cxxi/CppField.cs
similarity index 95%
rename from src/Mono.VisualC.Interop/CppField.cs
rename to src/Mono.Cxxi/CppField.cs
index aed2052b..3f95813c 100644
--- a/src/Mono.VisualC.Interop/CppField.cs
+++ b/src/Mono.Cxxi/CppField.cs
@@ -1,11 +1,11 @@
 //
-// Mono.VisualC.Interop.CppField.cs: Represents a field in a native C++ object
+// Mono.Cxxi.CppField.cs: Represents a field in a native C++ object
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -29,7 +29,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Mono.VisualC.Interop {
+namespace Mono.Cxxi {
 	public class CppField<T> {
 		private int fieldOffset;
 
diff --git a/src/Mono.VisualC.Interop/CppInstancePtr.cs b/src/Mono.Cxxi/CppInstancePtr.cs
similarity index 97%
rename from src/Mono.VisualC.Interop/CppInstancePtr.cs
rename to src/Mono.Cxxi/CppInstancePtr.cs
index 731f1287..b2b1c409 100644
--- a/src/Mono.VisualC.Interop/CppInstancePtr.cs
+++ b/src/Mono.Cxxi/CppInstancePtr.cs
@@ -1,11 +1,11 @@
 //
-// Mono.VisualC.Interop.CppInstancePtr.cs: Represents a pointer to a native C++ instance
+// Mono.Cxxi.CppInstancePtr.cs: Represents a pointer to a native C++ instance
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -32,9 +32,9 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
 
-using Mono.VisualC.Interop.ABI;
+using Mono.Cxxi.Abi;
 
-namespace Mono.VisualC.Interop {
+namespace Mono.Cxxi {
 	public struct CppInstancePtr : ICppObject {
 
 		private IntPtr ptr, native_vtptr;
diff --git a/src/Mono.VisualC.Interop/CppLibrary.cs b/src/Mono.Cxxi/CppLibrary.cs
similarity index 96%
rename from src/Mono.VisualC.Interop/CppLibrary.cs
rename to src/Mono.Cxxi/CppLibrary.cs
index b115f31d..9cdc6e69 100644
--- a/src/Mono.VisualC.Interop/CppLibrary.cs
+++ b/src/Mono.Cxxi/CppLibrary.cs
@@ -1,11 +1,11 @@
 //
-// Mono.VisualC.Interop.CppLibrary.cs: Represents a native C++ library for interop
+// Mono.Cxxi.CppLibrary.cs: Represents a native C++ library for interop
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -35,9 +35,9 @@ using System.Runtime.InteropServices;
 using System.Reflection;
 using System.Reflection.Emit;
 
-using Mono.VisualC.Interop.ABI;
+using Mono.Cxxi.Abi;
 
-namespace Mono.VisualC.Interop {
+namespace Mono.Cxxi {
 
 	public enum InlineMethods {
 
diff --git a/src/Mono.VisualC.Interop/CppModifiers.cs b/src/Mono.Cxxi/CppModifiers.cs
similarity index 97%
rename from src/Mono.VisualC.Interop/CppModifiers.cs
rename to src/Mono.Cxxi/CppModifiers.cs
index 9e80b5c9..30cb60eb 100644
--- a/src/Mono.VisualC.Interop/CppModifiers.cs
+++ b/src/Mono.Cxxi/CppModifiers.cs
@@ -1,11 +1,11 @@
 //
-// Mono.VisualC.Interop.CppModifiers.cs: Abstracts a C++ type modifiers
+// Mono.Cxxi.CppModifiers.cs: Abstracts a C++ type modifiers
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -31,9 +31,9 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-using Mono.VisualC.Interop.Util;
+using Mono.Cxxi.Util;
 
-namespace Mono.VisualC.Interop {
+namespace Mono.Cxxi {
 
 	public abstract class CppModifiers {
 		#pragma warning disable 0414
diff --git a/src/Mono.VisualC.Interop/CppObjectMarshaler.cs b/src/Mono.Cxxi/CppObjectMarshaler.cs
similarity index 96%
rename from src/Mono.VisualC.Interop/CppObjectMarshaler.cs
rename to src/Mono.Cxxi/CppObjectMarshaler.cs
index 64ef0d05..a55acac0 100644
--- a/src/Mono.VisualC.Interop/CppObjectMarshaler.cs
+++ b/src/Mono.Cxxi/CppObjectMarshaler.cs
@@ -2,7 +2,7 @@
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Mono.VisualC.Interop {
+namespace Mono.Cxxi {
 	public class CppObjectMarshaler : ICustomMarshaler {
 		private static CppObjectMarshaler marshaler = null;
 		private CppObjectMarshaler () {
diff --git a/src/Mono.VisualC.Interop/CppType.cs b/src/Mono.Cxxi/CppType.cs
similarity index 98%
rename from src/Mono.VisualC.Interop/CppType.cs
rename to src/Mono.Cxxi/CppType.cs
index 42c9b15f..c0606db6 100644
--- a/src/Mono.VisualC.Interop/CppType.cs
+++ b/src/Mono.Cxxi/CppType.cs
@@ -1,11 +1,11 @@
 //
-// Mono.VisualC.Interop.CppType.cs: Abstracts a C++ type declaration
+// Mono.Cxxi.CppType.cs: Abstracts a C++ type declaration
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -33,9 +33,9 @@ using System.Text.RegularExpressions;
 using System.Reflection;
 using System.Collections.Generic;
 
-using Mono.VisualC.Interop.Util;
+using Mono.Cxxi.Util;
 
-namespace Mono.VisualC.Interop {
+namespace Mono.Cxxi {
 
 	// These can be used anywhere a CppType could be used.
 	public enum CppTypes {
diff --git a/src/Mono.VisualC.Interop/CppTypeInfo.cs b/src/Mono.Cxxi/CppTypeInfo.cs
similarity index 97%
rename from src/Mono.VisualC.Interop/CppTypeInfo.cs
rename to src/Mono.Cxxi/CppTypeInfo.cs
index 2e6e55bd..51214e63 100644
--- a/src/Mono.VisualC.Interop/CppTypeInfo.cs
+++ b/src/Mono.Cxxi/CppTypeInfo.cs
@@ -1,11 +1,11 @@
 //
-// Mono.VisualC.Interop.CppTypeInfo.cs: Type metadata for C++ types
+// Mono.Cxxi.CppTypeInfo.cs: Type metadata for C++ types
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -34,10 +34,10 @@ using System.Collections.ObjectModel;
 
 using System.Runtime.InteropServices;
 
-using Mono.VisualC.Interop.ABI;
-using Mono.VisualC.Interop.Util;
+using Mono.Cxxi.Abi;
+using Mono.Cxxi.Util;
 
-namespace Mono.VisualC.Interop {
+namespace Mono.Cxxi {
 
 	// NOTE: As AddBase is called, properties change.
 	//  TypeComplete indicates when the dust has settled.
diff --git a/src/Mono.VisualC.Interop/Interfaces.cs b/src/Mono.Cxxi/Interfaces.cs
similarity index 94%
rename from src/Mono.VisualC.Interop/Interfaces.cs
rename to src/Mono.Cxxi/Interfaces.cs
index a5a73b28..f4a1765b 100644
--- a/src/Mono.VisualC.Interop/Interfaces.cs
+++ b/src/Mono.Cxxi/Interfaces.cs
@@ -1,11 +1,11 @@
 //
-// Mono.VisualC.Interop.Interfaces.cs
+// Mono.Cxxi.Interfaces.cs
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -27,9 +27,9 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 using System;
-using Mono.VisualC.Interop.ABI;
+using Mono.Cxxi.Abi;
 
-namespace Mono.VisualC.Interop {
+namespace Mono.Cxxi {
 
 	// The contract for ICppObject requires implementations to have the following constructors:
 	//  + A public constructor that takes CppInstancePtr (native constructor)
diff --git a/src/Mono.VisualC.Interop/Makefile.am b/src/Mono.Cxxi/Makefile.am
similarity index 79%
rename from src/Mono.VisualC.Interop/Makefile.am
rename to src/Mono.Cxxi/Makefile.am
index c80df25a..bfd480a5 100644
--- a/src/Mono.VisualC.Interop/Makefile.am
+++ b/src/Mono.Cxxi/Makefile.am
@@ -6,11 +6,10 @@ ASSEMBLY_COMPILER_COMMAND = mcs
 ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
 BUILD_DIR = $(top_srcdir)/bin/Debug
 
-ASSEMBLY = $(BUILD_DIR)/Mono.VisualC.Interop.dll
+ASSEMBLY = $(BUILD_DIR)/Mono.Cxxi.dll
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 
-MONO_VISUALC_INTEROP_DLL_MDB_SOURCE=bin/Debug/Mono.VisualC.Interop.dll.mdb
-MONO_VISUALC_INTEROP_DLL_MDB=$(BUILD_DIR)/Mono.VisualC.Interop.dll.mdb
+MONO_CXXI_DLL_MDB=$(BUILD_DIR)/Mono.Cxxi.dll.mdb
 
 endif
 
@@ -19,7 +18,7 @@ ASSEMBLY_COMPILER_COMMAND = mcs
 ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+
 BUILD_DIR = $(top_srcdir)/bin/Release
 
-ASSEMBLY = $(BUILD_DIR)/Mono.VisualC.Interop.dll
+ASSEMBLY = $(BUILD_DIR)/Mono.Cxxi.dll
 ASSEMBLY_MDB = 
 
 MONO_VISUALC_INTEROP_DLL_MDB=
@@ -33,10 +32,10 @@ AL=al2
 SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
 
 PROGRAMFILES = \
-	$(MONO_VISUALC_INTEROP_DLL_MDB)  
+	$(MONO_CXXI_DLL_MDB)
 
 LINUX_PKGCONFIG = \
-	$(MONO_VISUALC_INTEROP_PC)  
+	$(MONO_CXXI_PC)
 
 
 RESGEN=resgen2
@@ -75,7 +74,7 @@ EXTRAS = \
 	ABI \
 	ABI/Impl \
 	Util \
-	mono.visualc.interop.pc.in 
+	mono.cxxi.pc.in
 
 REFERENCES =  \
 	System \
@@ -87,9 +86,9 @@ CLEANFILES = $(PROGRAMFILES) $(LINUX_PKGCONFIG)
 
 include $(top_srcdir)/Makefile.include
 
-MONO_VISUALC_INTEROP_PC = $(BUILD_DIR)/mono.visualc.interop.pc
+MONO_CXXI_PC = $(BUILD_DIR)/mono.cxxi.pc
 
-$(eval $(call emit-deploy-wrapper,MONO_VISUALC_INTEROP_PC,mono.visualc.interop.pc))
+$(eval $(call emit-deploy-wrapper,MONO_CXXI_PC,mono.cxxi.pc))
 
 
 $(eval $(call emit_resgen_targets))
diff --git a/src/Mono.VisualC.Interop/Mono.VisualC.Interop.csproj b/src/Mono.Cxxi/Mono.Cxxi.csproj
similarity index 89%
rename from src/Mono.VisualC.Interop/Mono.VisualC.Interop.csproj
rename to src/Mono.Cxxi/Mono.Cxxi.csproj
index 640641a0..09d9c9b3 100644
--- a/src/Mono.VisualC.Interop/Mono.VisualC.Interop.csproj
+++ b/src/Mono.Cxxi/Mono.Cxxi.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{4A864586-93C5-4DC1-8A80-F094A88506D7}</ProjectGuid>
     <OutputType>Library</OutputType>
     <SchemaVersion>2.0</SchemaVersion>
-    <RootNamespace>Mono.VisualC.Interop</RootNamespace>
+    <RootNamespace>Mono.Cxxi</RootNamespace>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -39,7 +39,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <AssemblyName>Mono.VisualC.Interop</AssemblyName>
+    <AssemblyName>Mono.Cxxi</AssemblyName>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -59,16 +59,16 @@
   <ItemGroup>
     <Compile Include="CppLibrary.cs" />
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="ABI\CppAbi.cs" />
+    <Compile Include="Abi\CppAbi.cs" />
     <Compile Include="Interfaces.cs" />
     <Compile Include="Attributes.cs" />
     <Compile Include="CppInstancePtr.cs" />
     <Compile Include="CppField.cs" />
-    <Compile Include="ABI\VTable.cs" />
-    <Compile Include="ABI\MethodType.cs" />
-    <Compile Include="ABI\Impl\ItaniumAbi.cs" />
-    <Compile Include="ABI\Impl\VirtualOnlyAbi.cs" />
-    <Compile Include="ABI\Impl\MsvcAbi.cs" />
+    <Compile Include="Abi\VTable.cs" />
+    <Compile Include="Abi\MethodType.cs" />
+    <Compile Include="Abi\Impl\ItaniumAbi.cs" />
+    <Compile Include="Abi\Impl\VirtualOnlyAbi.cs" />
+    <Compile Include="Abi\Impl\MsvcAbi.cs" />
     <Compile Include="CppObjectMarshaler.cs" />
     <Compile Include="CppType.cs" />
     <Compile Include="CppTypeInfo.cs" />
@@ -78,7 +78,7 @@
     <Compile Include="Util\ReflectionHelper.cs" />
     <Compile Include="Util\MethodSignature.cs" />
     <Compile Include="CppModifiers.cs" />
-    <Compile Include="ABI\Impl\ItaniumTypeInfo.cs" />
+    <Compile Include="Abi\Impl\ItaniumTypeInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/src/Mono.VisualC.Interop/Util/DelegateTypeCache.cs b/src/Mono.Cxxi/Util/DelegateTypeCache.cs
similarity index 95%
rename from src/Mono.VisualC.Interop/Util/DelegateTypeCache.cs
rename to src/Mono.Cxxi/Util/DelegateTypeCache.cs
index 57ede9e0..d5be361b 100644
--- a/src/Mono.VisualC.Interop/Util/DelegateTypeCache.cs
+++ b/src/Mono.Cxxi/Util/DelegateTypeCache.cs
@@ -1,11 +1,11 @@
 //
-// Mono.VisualC.Interop.Util.DelegateTypeCache.cs: Automatic delegate type creation and caching
+// Mono.Cxxi.Util.DelegateTypeCache.cs: Automatic delegate type creation and caching
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -33,7 +33,7 @@ using System.Reflection.Emit;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
 
-namespace Mono.VisualC.Interop.Util {
+namespace Mono.Cxxi.Util {
 
 	public static class DelegateTypeCache {
 
diff --git a/src/Mono.VisualC.Interop/Util/IEnumerableTransform.cs b/src/Mono.Cxxi/Util/IEnumerableTransform.cs
similarity index 98%
rename from src/Mono.VisualC.Interop/Util/IEnumerableTransform.cs
rename to src/Mono.Cxxi/Util/IEnumerableTransform.cs
index d8187e3c..6bd54fc3 100644
--- a/src/Mono.VisualC.Interop/Util/IEnumerableTransform.cs
+++ b/src/Mono.Cxxi/Util/IEnumerableTransform.cs
@@ -1,11 +1,11 @@
 //
-// Mono.VisualC.Interop.Util.IEnumerableTransform.cs: Rule-based transformation for IEnumerable
+// Mono.Cxxi.Util.IEnumerableTransform.cs: Rule-based transformation for IEnumerable
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -31,7 +31,7 @@ using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Mono.VisualC.Interop.Util {
+namespace Mono.Cxxi.Util {
 
 
 	public static class IEnumerableTransform {
diff --git a/src/Mono.VisualC.Interop/Util/LazyGeneratedList.cs b/src/Mono.Cxxi/Util/LazyGeneratedList.cs
similarity index 94%
rename from src/Mono.VisualC.Interop/Util/LazyGeneratedList.cs
rename to src/Mono.Cxxi/Util/LazyGeneratedList.cs
index 48ba5009..45d4be90 100644
--- a/src/Mono.VisualC.Interop/Util/LazyGeneratedList.cs
+++ b/src/Mono.Cxxi/Util/LazyGeneratedList.cs
@@ -1,11 +1,11 @@
 //
-// Mono.VisualC.Interop.Util.LazyGeneratedList.cs: A list whose items are generated and cached on first access
+// Mono.Cxxi.Util.LazyGeneratedList.cs: A list whose items are generated and cached on first access
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Mono.VisualC.Interop.Util {
+namespace Mono.Cxxi.Util {
 
 	public class LazyGeneratedList<TItem> : IList<TItem>
 		where TItem : class
diff --git a/src/Mono.VisualC.Interop/Util/MethodSignature.cs b/src/Mono.Cxxi/Util/MethodSignature.cs
similarity index 94%
rename from src/Mono.VisualC.Interop/Util/MethodSignature.cs
rename to src/Mono.Cxxi/Util/MethodSignature.cs
index efd559ad..c3dd66db 100644
--- a/src/Mono.VisualC.Interop/Util/MethodSignature.cs
+++ b/src/Mono.Cxxi/Util/MethodSignature.cs
@@ -1,11 +1,11 @@
 //
-// Mono.VisualC.Interop.Util.MethodSignature.cs: Hash-friendly structs to represent arbitrary method and delegate signatures
+// Mono.Cxxi.Util.MethodSignature.cs: Hash-friendly structs to represent arbitrary method and delegate signatures
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -33,7 +33,9 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
 
-namespace Mono.VisualC.Interop.Util {
+using Mono.Cxxi.Abi;
+
+namespace Mono.Cxxi.Util {
 
 	public class BasicSignature {
 		public CallingConvention? CallingConvention { get; set; }
diff --git a/src/Mono.VisualC.Interop/Util/ReflectionHelper.cs b/src/Mono.Cxxi/Util/ReflectionHelper.cs
similarity index 96%
rename from src/Mono.VisualC.Interop/Util/ReflectionHelper.cs
rename to src/Mono.Cxxi/Util/ReflectionHelper.cs
index 54be1891..ba92da2a 100644
--- a/src/Mono.VisualC.Interop/Util/ReflectionHelper.cs
+++ b/src/Mono.Cxxi/Util/ReflectionHelper.cs
@@ -1,11 +1,11 @@
 //
-// Mono.VisualC.Interop.Util.ReflectionHelper.cs: Helper methods for common reflection API tasks
+// Mono.Cxxi.Util.ReflectionHelper.cs: Helper methods for common reflection API tasks
 //
 // Author:
 //   Alexander Corrado (alexander.corrado@gmail.com)
 //   Andreia Gaita (shana@spoiledcat.net)
 //
-// Copyright (C) 2010 Alexander Corrado
+// Copyright (C) 2010-2011 Alexander Corrado
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
 using System.Reflection;
 using System.Reflection.Emit;
 
-namespace Mono.VisualC.Interop.Util {
+namespace Mono.Cxxi.Util {
 	internal static class ReflectionHelper {
 
 		public static MethodInfo GetMethodInfoForDelegate (Type delType)
diff --git a/src/Mono.Cxxi/mono.cxxi.pc.in b/src/Mono.Cxxi/mono.cxxi.pc.in
new file mode 100644
index 00000000..8aaa4255
--- /dev/null
+++ b/src/Mono.Cxxi/mono.cxxi.pc.in
@@ -0,0 +1,6 @@
+Name: Mono.Cxxi
+Description: C++ interoperability for managed code
+Version: 0.1
+
+Requires: 
+Libs: -r:@expanded_libdir@/@PACKAGE@/Mono.Cxxi.dll
diff --git a/src/Mono.VisualC.Interop/mono.visualc.interop.pc.in b/src/Mono.VisualC.Interop/mono.visualc.interop.pc.in
deleted file mode 100644
index 1d65dc82..00000000
--- a/src/Mono.VisualC.Interop/mono.visualc.interop.pc.in
+++ /dev/null
@@ -1,6 +0,0 @@
-Name: Mono.VisualC.Interop
-Description: Mono.VisualC.Interop
-Version: 0.1
-
-Requires: 
-Libs: -r:@expanded_libdir@/@PACKAGE@/CPPInterop.dll
diff --git a/src/generator/Field.cs b/src/generator/Field.cs
index 3b3616e9..a9bd285a 100644
--- a/src/generator/Field.cs
+++ b/src/generator/Field.cs
@@ -32,7 +32,7 @@ using System.Collections.Generic;
 using System.CodeDom;
 using System.CodeDom.Compiler;
 
-using Mono.VisualC.Interop;
+using Mono.Cxxi;
 
 public class Field {
 
diff --git a/src/generator/Generator.cs b/src/generator/Generator.cs
index bed6f131..125a9b5c 100644
--- a/src/generator/Generator.cs
+++ b/src/generator/Generator.cs
@@ -12,7 +12,7 @@ using System.Reflection;
 
 using Templates;
 using NDesk.Options;
-using Mono.VisualC.Interop;
+using Mono.Cxxi;
 
 public class Generator {
 
diff --git a/src/generator/Makefile.am b/src/generator/Makefile.am
index 705b79a5..00740624 100644
--- a/src/generator/Makefile.am
+++ b/src/generator/Makefile.am
@@ -9,8 +9,8 @@ BUILD_DIR = $(top_srcdir)/bin/Debug
 ASSEMBLY = $(BUILD_DIR)/generator.exe
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 
-MONO_VISUALC_INTEROP_DLL_SOURCE=$(BUILD_DIR)/Mono.VisualC.Interop.dll
-MONO_VISUALC_INTEROP_DLL=$(BUILD_DIR)/Mono.VisualC.Interop.dll
+MONO_CXXI_DLL_SOURCE=$(BUILD_DIR)/Mono.Cxxi.dll
+MONO_CXXI_DLL=$(BUILD_DIR)/Mono.Cxxi.dll
 GENERATOR_EXE_MDB_SOURCE=$(BUILD_DIR)/generator.exe.mdb
 GENERATOR_EXE_MDB=$(BUILD_DIR)/generator.exe.mdb
 
@@ -24,8 +24,8 @@ BUILD_DIR = $(top_srcdir)/bin/Release
 ASSEMBLY = $(BUILD_DIR)/generator.exe
 ASSEMBLY_MDB = 
 
-MONO_VISUALC_INTEROP_DLL_SOURCE=$(BUILD_DIR)/Mono.VisualC.Interop.dll
-MONO_VISUALC_INTEROP_DLL=$(BUILD_DIR)/Mono.VisualC.Interop.dll
+MONO_CXXI_DLL_SOURCE=$(BUILD_DIR)/Mono.Cxxi.dll
+MONO_CXXI_DLL=$(BUILD_DIR)/Mono.Cxxi.dll
 GENERATOR_EXE_MDB= 
 
 endif
@@ -36,7 +36,7 @@ AL=al2
 SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
 
 PROGRAMFILES = \
-	$(MONO_VISUALC_INTEROP_DLL) \
+	$(MONO_CXXI_DLL) \
 	$(GENERATOR_EXE_MDB)
 
 BINARIES = \
@@ -70,7 +70,7 @@ EXTRAS = \
 	generator.in 
 
 REFERENCES =  \
-	../../bin/Debug/Mono.VisualC.Interop.dll \
+	../../bin/Debug/Mono.Cxxi.dll \
 	System \
 	System.Core \
 	System.Xml \
@@ -84,9 +84,8 @@ include $(top_srcdir)/Makefile.include
 
 GENERATOR = $(BUILD_DIR)/generator
 
-$(eval $(call emit-deploy-target,MONO_VISUALC_INTEROP_DLL))
+$(eval $(call emit-deploy-target,MONO_CXXI_DLL))
 $(eval $(call emit-deploy-wrapper,GENERATOR,generator,x))
-$(eval $(call emit-deploy-target,CPPINTEROP_DLL))
 
 
 $(eval $(call emit_resgen_targets))
diff --git a/src/generator/Method.cs b/src/generator/Method.cs
index f90b1771..c17a2e29 100644
--- a/src/generator/Method.cs
+++ b/src/generator/Method.cs
@@ -31,7 +31,7 @@ using System;
 using System.Linq;
 using System.Collections.Generic;
 
-using Mono.VisualC.Interop;
+using Mono.Cxxi;
 
 public class Method {
 
diff --git a/src/generator/Parameter.cs b/src/generator/Parameter.cs
index b5e623c9..ccfafc71 100644
--- a/src/generator/Parameter.cs
+++ b/src/generator/Parameter.cs
@@ -27,7 +27,7 @@ using System.Collections.Generic;
 using System.CodeDom;
 using System.CodeDom.Compiler;
 
-using Mono.VisualC.Interop;
+using Mono.Cxxi;
 
 public class Parameter
 {
diff --git a/src/generator/Property.cs b/src/generator/Property.cs
index a8aa1c80..c05ee7e7 100644
--- a/src/generator/Property.cs
+++ b/src/generator/Property.cs
@@ -28,7 +28,7 @@
 using System;
 using System.Collections.Generic;
 
-using Mono.VisualC.Interop;
+using Mono.Cxxi;
 
 public class Property {
 
diff --git a/src/generator/Templates/CSharp/CSharpClass.cs b/src/generator/Templates/CSharp/CSharpClass.cs
index 064d6e67..1c8f9de5 100644
--- a/src/generator/Templates/CSharp/CSharpClass.cs
+++ b/src/generator/Templates/CSharp/CSharpClass.cs
@@ -12,7 +12,7 @@ namespace Templates {
     using System.IO;
     using System.Linq;
     using System.Collections.Generic;
-    using Mono.VisualC.Interop;
+    using Mono.Cxxi;
     using System;
     
     
@@ -196,7 +196,7 @@ private bool IsByVal (CppType t)
             #line hidden
             
             #line 16 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\n//\n//  This file was auto generated. Do not edit.\n// -------------------------------------------------------------------------\n\nusing System;\nusing Mono.VisualC.Interop;\n\nnamespace ");
+            this.Write("\n//\n//  This file was auto generated. Do not edit.\n// -------------------------------------------------------------------------\n\nusing System;\nusing Mono.Cxxi;\n\nnamespace ");
             
             #line default
             #line hidden
diff --git a/src/generator/Templates/CSharp/CSharpClass.tt b/src/generator/Templates/CSharp/CSharpClass.tt
index 9826f5f4..655bc2fd 100644
--- a/src/generator/Templates/CSharp/CSharpClass.tt
+++ b/src/generator/Templates/CSharp/CSharpClass.tt
@@ -2,7 +2,7 @@
 <#@ import namespace="System.IO" #>
 <#@ import namespace="System.Linq" #>
 <#@ import namespace="System.Collections.Generic" #>
-<#@ import namespace="Mono.VisualC.Interop" #>
+<#@ import namespace="Mono.Cxxi" #>
 <#
 	var hasBase = Class.BaseClasses.Count > 0;
 	var wrapper = Class.Name;
@@ -19,7 +19,7 @@
 // -------------------------------------------------------------------------
 
 using System;
-using Mono.VisualC.Interop;
+using Mono.Cxxi;
 
 namespace <#= Generator.Namespace #> {
 
diff --git a/src/generator/Templates/CSharp/CSharpLibs.cs b/src/generator/Templates/CSharp/CSharpLibs.cs
index b7ddfb8b..74249c60 100644
--- a/src/generator/Templates/CSharp/CSharpLibs.cs
+++ b/src/generator/Templates/CSharp/CSharpLibs.cs
@@ -30,7 +30,7 @@ namespace Templates {
             #line hidden
             
             #line 4 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpLibs.tt"
-            this.Write("\n//\n//  This file was auto generated. Do not edit.\n// -------------------------------------------------------------------------\n\nusing System;\nusing Mono.VisualC.Interop;\n\nnamespace ");
+            this.Write("\n//\n//  This file was auto generated. Do not edit.\n// -------------------------------------------------------------------------\n\nusing System;\nusing Mono.Cxxi;\n\nnamespace ");
             
             #line default
             #line hidden
diff --git a/src/generator/Templates/CSharp/CSharpLibs.tt b/src/generator/Templates/CSharp/CSharpLibs.tt
index e95fe73f..57f94b56 100644
--- a/src/generator/Templates/CSharp/CSharpLibs.tt
+++ b/src/generator/Templates/CSharp/CSharpLibs.tt
@@ -7,7 +7,7 @@
 // -------------------------------------------------------------------------
 
 using System;
-using Mono.VisualC.Interop;
+using Mono.Cxxi;
 
 namespace <#= Generator.Namespace #> {
 
diff --git a/src/generator/generator.csproj b/src/generator/generator.csproj
index 72ffebc7..9adffd87 100644
--- a/src/generator/generator.csproj
+++ b/src/generator/generator.csproj
@@ -113,9 +113,9 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <ProjectReference Include="..\Mono.VisualC.Interop\Mono.VisualC.Interop.csproj">
+    <ProjectReference Include="..\Mono.Cxxi\Mono.Cxxi.csproj">
       <Project>{4A864586-93C5-4DC1-8A80-F094A88506D7}</Project>
-      <Name>Mono.VisualC.Interop</Name>
+      <Name>Mono.Cxxi</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f2971a65..d0fdeb16 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,7 @@ top_srcdir = ../
 BUILD_DIR = $(top_srcdir)/bin/Debug
 
 INTEROP_DLL = \
-	$(BUILD_DIR)/Mono.VisualC.Interop.dll
+	$(BUILD_DIR)/Mono.Cxxi.dll
 
 TEST_DLL = $(BUILD_DIR)/Test.dll
 
@@ -12,7 +12,6 @@ NATIVE = \
 
 MANAGED =  \
 	ByValTests.cs \
-	Support/CppMockObject.cs \
 	Support/CppNUnitAsserts.cs \
 	VirtualTests.cs
 	
diff --git a/tests/Support/CppMockObject.cs b/tests/Support/CppMockObject.cs
deleted file mode 100644
index 6c19920f..00000000
--- a/tests/Support/CppMockObject.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// CPPTestLibBase.cs: Base class for supporting tests using CPPTestLib
-//
-// Author:
-//   Alexander Corrado (alexander.corrado@gmail.com)
-//
-// Copyright (C) 2010 Alexander Corrado
-//
-
-using System;
-using NUnit.Framework;
-
-using Mono.VisualC.Interop;
-using Mono.VisualC.Interop.ABI;
-
-namespace Tests.Support {
-        public class CppMockObject : ICppObject {
-
-                public static CppMockObject Instance = new CppMockObject ();
-
-                protected CppMockObject ()
-                {
-                }
-
-                public CppInstancePtr Native {
-                        get {
-                                throw new System.NotImplementedException ();
-                        }
-                }
-
-                public int NativeSize {
-                        get {
-                                throw new NotImplementedException ();
-                        }
-                }
-
-                public void Dispose ()
-                {
-                        throw new System.NotImplementedException ();
-                }
-                
-
-        }
-
-        public interface EmptyTestInterface : ICppClassOverridable<CppMockObject> {
-        }
-
-        public struct EmptyTestStruct {
-        }
-}
-
diff --git a/tests/Support/CppNUnitAsserts.cs b/tests/Support/CppNUnitAsserts.cs
index b95506fd..b3bbdccd 100644
--- a/tests/Support/CppNUnitAsserts.cs
+++ b/tests/Support/CppNUnitAsserts.cs
@@ -10,7 +10,7 @@
 using System;
 using System.Runtime.InteropServices;
 using NUnit.Framework;
-using Mono.VisualC.Interop;
+using Mono.Cxxi;
 
 namespace Tests.Support {
         public static class CppNUnitAsserts {
diff --git a/tests/Tests.csproj b/tests/Tests.csproj
index 23fe9189..2345648e 100644
--- a/tests/Tests.csproj
+++ b/tests/Tests.csproj
@@ -95,9 +95,9 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\src\Mono.VisualC.Interop\Mono.VisualC.Interop.csproj">
+    <ProjectReference Include="..\src\Mono.Cxxi\Mono.Cxxi.csproj">
       <Project>{4A864586-93C5-4DC1-8A80-F094A88506D7}</Project>
-      <Name>Mono.VisualC.Interop</Name>
+      <Name>Mono.Cxxi</Name>
     </ProjectReference>
   </ItemGroup>
 </Project>
\ No newline at end of file