diff --git a/NoRM/BSON/BSONSerializer.cs b/NoRM/BSON/BsonSerializer.cs
similarity index 100%
rename from NoRM/BSON/BSONSerializer.cs
rename to NoRM/BSON/BsonSerializer.cs
diff --git a/NoRM/BSON/DbTypes/DBReference.cs b/NoRM/BSON/DbTypes/DbReference.cs
similarity index 100%
rename from NoRM/BSON/DbTypes/DBReference.cs
rename to NoRM/BSON/DbTypes/DbReference.cs
diff --git a/NoRM/BSON/DbTypes/ObjectId.cs b/NoRM/BSON/DbTypes/ObjectId.cs
index f1ad89b1..a4d54ec0 100644
--- a/NoRM/BSON/DbTypes/ObjectId.cs
+++ b/NoRM/BSON/DbTypes/ObjectId.cs
@@ -7,6 +7,7 @@ namespace Norm
     /// Represents a Mongo document's ObjectId
     /// </summary>
     [System.ComponentModel.TypeConverter(typeof(ObjectIdTypeConverter))]
+    [Serializable]
     public class ObjectId
     {        
         private string _string;
@@ -223,4 +224,4 @@ public static implicit operator ObjectId(String oidString)
             return retval;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/NoRM/NoRM.csproj b/NoRM/NoRM.csproj
index b252192e..f7c8a00c 100644
--- a/NoRM/NoRM.csproj
+++ b/NoRM/NoRM.csproj
@@ -276,4 +276,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>