diff --git a/include/osgIntrospection/Reflector b/include/osgIntrospection/Reflector
index 9ecdf2717..3368abf17 100644
--- a/include/osgIntrospection/Reflector
+++ b/include/osgIntrospection/Reflector
@@ -626,8 +626,8 @@ namespace osgIntrospection
 
                 switch (_i)
                 {                
-                case 0: ctr.first = variant_cast<const typename T::first_Type& >(v); break;
-                case 1: ctr.second = variant_cast<const typename T::second_Type& >(v); break;
+                case 0: ctr.first = variant_cast<const typename T::first_type& >(v); break;
+                case 1: ctr.second = variant_cast<const typename T::second_type& >(v); break;
                 }
             }
 
diff --git a/include/osgIntrospection/Type b/include/osgIntrospection/Type
index 2e63cd0c4..1cd20c4e7 100644
--- a/include/osgIntrospection/Type
+++ b/include/osgIntrospection/Type
@@ -11,8 +11,8 @@
  * OpenSceneGraph Public License for more details.
 */
 //osgIntrospection - Copyright (C) 2005 Marco Jez
-#ifndef OSGINTROSPECTION__type
-#define OSGINTROSPECTION__type
+#ifndef OSGINTROSPECTION_TYPE
+#define OSGINTROSPECTION_TYPE
 
 #include <osgIntrospection/Export>
 #include <osgIntrospection/Exceptions>