diff --git a/src/osgWrappers/osg/Program.cpp b/src/osgWrappers/osg/Program.cpp
index d01b9b6d2..ea8d49594 100644
--- a/src/osgWrappers/osg/Program.cpp
+++ b/src/osgWrappers/osg/Program.cpp
@@ -27,7 +27,7 @@
 
 TYPE_NAME_ALIAS(std::map< std::string COMMA  GLuint >, osg::Program::AttribBindingList);
 
-TYPE_NAME_ALIAS(std::map< std::string COMMA  std::pair< GLint COMMA  GLenum > >, osg::Program::NameInfoMap);
+TYPE_NAME_ALIAS(std::map< std::string COMMA  osg::Program::ActiveVarInfo >, osg::Program::ActiveVarInfoMap);
 
 BEGIN_OBJECT_REFLECTOR(osg::Program)
 	I_BaseType(osg::StateAttribute);
@@ -54,14 +54,19 @@ BEGIN_OBJECT_REFLECTOR(osg::Program)
 	I_Method0(const osg::Program::AttribBindingList &, getAttribBindingList);
 	I_Method0(bool, isFixedFunction);
 	I_Method2(bool, getGlProgramInfoLog, IN, unsigned int, contextID, IN, std::string &, log);
-	I_Method1(const osg::Program::NameInfoMap &, getActiveUniforms, IN, unsigned int, contextID);
-	I_Method1(const osg::Program::NameInfoMap &, getActiveAttribs, IN, unsigned int, contextID);
+	I_Method1(const osg::Program::ActiveVarInfoMap &, getActiveUniforms, IN, unsigned int, contextID);
+	I_Method1(const osg::Program::ActiveVarInfoMap &, getActiveAttribs, IN, unsigned int, contextID);
 	I_Method1(osg::Program::PerContextProgram *, getPCP, IN, unsigned int, contextID);
 	I_ReadOnlyProperty(const osg::Program::AttribBindingList &, AttribBindingList);
 	I_ArrayProperty_GA(osg::Shader *, Shader, Shaders, unsigned int, bool);
 	I_ReadOnlyProperty(osg::StateAttribute::Type, Type);
 END_REFLECTOR
 
+BEGIN_VALUE_REFLECTOR(osg::Program::ActiveVarInfo)
+	I_Constructor0();
+	I_Constructor3(IN, GLint, loc, IN, GLenum, type, IN, GLint, size);
+END_REFLECTOR
+
 BEGIN_OBJECT_REFLECTOR(osg::Program::PerContextProgram)
 	I_BaseType(osg::Referenced);
 	I_Constructor2(IN, const osg::Program *, program, IN, unsigned int, contextID);
@@ -75,18 +80,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Program::PerContextProgram)
 	I_Method0(void, useProgram);
 	I_Method0(void, resetAppliedUniforms);
 	I_Method1(void, apply, IN, const osg::Uniform &, uniform);
-	I_Method0(const osg::Program::NameInfoMap &, getActiveUniforms);
-	I_Method0(const osg::Program::NameInfoMap &, getActiveAttribs);
+	I_Method0(const osg::Program::ActiveVarInfoMap &, getActiveUniforms);
+	I_Method0(const osg::Program::ActiveVarInfoMap &, getActiveAttribs);
 	I_Method1(GLint, getUniformLocation, IN, const std::string &, name);
 	I_Method1(GLint, getAttribLocation, IN, const std::string &, name);
-	I_ReadOnlyProperty(const osg::Program::NameInfoMap &, ActiveAttribs);
-	I_ReadOnlyProperty(const osg::Program::NameInfoMap &, ActiveUniforms);
+	I_ReadOnlyProperty(const osg::Program::ActiveVarInfoMap &, ActiveAttribs);
+	I_ReadOnlyProperty(const osg::Program::ActiveVarInfoMap &, ActiveUniforms);
 	I_ReadOnlyProperty(GLuint, Handle);
 END_REFLECTOR
 
 STD_MAP_REFLECTOR(std::map< std::string COMMA  GLuint >);
 
-STD_MAP_REFLECTOR(std::map< std::string COMMA  std::pair< GLint COMMA  GLenum > >);
-
-STD_PAIR_REFLECTOR(std::pair< GLint COMMA  GLenum >);
+STD_MAP_REFLECTOR(std::map< std::string COMMA  osg::Program::ActiveVarInfo >);
 
diff --git a/src/osgWrappers/osgProducer/OsgCameraGroup.cpp b/src/osgWrappers/osgProducer/OsgCameraGroup.cpp
index 53a7ee0f6..4dd7489d7 100644
--- a/src/osgWrappers/osgProducer/OsgCameraGroup.cpp
+++ b/src/osgWrappers/osgProducer/OsgCameraGroup.cpp
@@ -32,11 +32,11 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(Producer::CameraGroup::ThreadingModel, osgProducer::OsgCameraGroup::ThreadingModel);
+TYPE_NAME_ALIAS(Producer::CameraGroup::ThreadModel, osgProducer::OsgCameraGroup::ThreadingModel);
 
 TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgProducer::GraphicsContextImplementation > >, osgProducer::OsgCameraGroup::GraphicsContextList);
 
-TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgProducer::OsgSceneHandler > >, osgProducer::OsgCameraGroup::SceneHandlerList);
+TYPE_NAME_ALIAS(std::vector< Producer::ref_ptr< osgProducer::OsgSceneHandler > >, osgProducer::OsgCameraGroup::SceneHandlerList);
 
 BEGIN_VALUE_REFLECTOR(osgProducer::OsgCameraGroup)
 	I_Constructor0();
@@ -125,19 +125,7 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgProducer::GraphicsContextImplementation >
 	I_ReadOnlyProperty(osgProducer::GraphicsContextImplementation *, );
 END_REFLECTOR
 
-BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgProducer::OsgSceneHandler >)
-	I_Constructor0();
-	I_Constructor1(IN, osgProducer::OsgSceneHandler *, t);
-	I_Constructor1(IN, const osg::ref_ptr< osgProducer::OsgSceneHandler > &, rp);
-	I_Method0(bool, valid);
-	I_Method0(osgProducer::OsgSceneHandler *, get);
-	I_Method0(const osgProducer::OsgSceneHandler *, get);
-	I_Method0(osgProducer::OsgSceneHandler *, take);
-	I_Method0(osgProducer::OsgSceneHandler *, release);
-	I_ReadOnlyProperty(osgProducer::OsgSceneHandler *, );
-END_REFLECTOR
+STD_VECTOR_REFLECTOR(std::vector< Producer::ref_ptr< osgProducer::OsgSceneHandler > >);
 
 STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgProducer::GraphicsContextImplementation > >);
 
-STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgProducer::OsgSceneHandler > >);
-