diff --git a/onvif/proxy/lib/WSDiscovery/Elements/EndpointReference.pm b/onvif/proxy/lib/WSDiscovery/Elements/EndpointReference.pm
deleted file mode 100644
index 96c690bb4..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/EndpointReference.pm
+++ /dev/null
@@ -1,63 +0,0 @@
-
-package WSDiscovery::Elements::EndpointReference;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
-
-__PACKAGE__->__set_name('EndpointReference');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::EndpointReferenceType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::EndpointReference
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-EndpointReference from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::EndpointReference->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::EndpointReferenceType
-   Address =>  { value => $some_value },
-   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
-   },
-   Metadata =>  { # WSDiscovery::Types::MetadataType
-   },
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/FaultTo.pm b/onvif/proxy/lib/WSDiscovery/Elements/FaultTo.pm
deleted file mode 100644
index 530f9a4a4..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/FaultTo.pm
+++ /dev/null
@@ -1,63 +0,0 @@
-
-package WSDiscovery::Elements::FaultTo;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
-
-__PACKAGE__->__set_name('FaultTo');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::EndpointReferenceType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::FaultTo
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-FaultTo from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::FaultTo->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::EndpointReferenceType
-   Address =>  { value => $some_value },
-   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
-   },
-   Metadata =>  { # WSDiscovery::Types::MetadataType
-   },
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/From.pm b/onvif/proxy/lib/WSDiscovery/Elements/From.pm
deleted file mode 100644
index 727c6a7ef..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/From.pm
+++ /dev/null
@@ -1,63 +0,0 @@
-
-package WSDiscovery::Elements::From;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
-
-__PACKAGE__->__set_name('From');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::EndpointReferenceType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::From
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-From from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::From->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::EndpointReferenceType
-   Address =>  { value => $some_value },
-   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
-   },
-   Metadata =>  { # WSDiscovery::Types::MetadataType
-   },
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Metadata.pm b/onvif/proxy/lib/WSDiscovery/Elements/Metadata.pm
deleted file mode 100644
index 1567ef36a..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/Metadata.pm
+++ /dev/null
@@ -1,58 +0,0 @@
-
-package WSDiscovery::Elements::Metadata;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
-
-__PACKAGE__->__set_name('Metadata');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::MetadataType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::Metadata
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-Metadata from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::Metadata->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::MetadataType
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ProblemAction.pm b/onvif/proxy/lib/WSDiscovery/Elements/ProblemAction.pm
deleted file mode 100644
index 2512b7e91..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/ProblemAction.pm
+++ /dev/null
@@ -1,60 +0,0 @@
-
-package WSDiscovery::Elements::ProblemAction;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
-
-__PACKAGE__->__set_name('ProblemAction');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ProblemActionType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::ProblemAction
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-ProblemAction from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::ProblemAction->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::ProblemActionType
-   Action =>  { value => $some_value },
-   SoapAction =>  $some_value, # anyURI
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ProblemHeaderQName.pm b/onvif/proxy/lib/WSDiscovery/Elements/ProblemHeaderQName.pm
deleted file mode 100644
index bd6f34982..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/ProblemHeaderQName.pm
+++ /dev/null
@@ -1,57 +0,0 @@
-
-package WSDiscovery::Elements::ProblemHeaderQName;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
-
-__PACKAGE__->__set_name('ProblemHeaderQName');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedQNameType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::ProblemHeaderQName
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-ProblemHeaderQName from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::ProblemHeaderQName->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { value => $some_value },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ReferenceParameters.pm b/onvif/proxy/lib/WSDiscovery/Elements/ReferenceParameters.pm
deleted file mode 100644
index 1f8cd7cbc..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/ReferenceParameters.pm
+++ /dev/null
@@ -1,58 +0,0 @@
-
-package WSDiscovery::Elements::ReferenceParameters;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
-
-__PACKAGE__->__set_name('ReferenceParameters');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ReferenceParametersType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::ReferenceParameters
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-ReferenceParameters from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::ReferenceParameters->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::ReferenceParametersType
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ReplyTo.pm b/onvif/proxy/lib/WSDiscovery/Elements/ReplyTo.pm
deleted file mode 100644
index 428378c5e..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/ReplyTo.pm
+++ /dev/null
@@ -1,63 +0,0 @@
-
-package WSDiscovery::Elements::ReplyTo;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
-
-__PACKAGE__->__set_name('ReplyTo');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::EndpointReferenceType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::ReplyTo
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-ReplyTo from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::ReplyTo->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::EndpointReferenceType
-   Address =>  { value => $some_value },
-   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
-   },
-   Metadata =>  { # WSDiscovery::Types::MetadataType
-   },
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Resolve.pm b/onvif/proxy/lib/WSDiscovery/Elements/Resolve.pm
deleted file mode 100644
index 57849ce57..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/Resolve.pm
+++ /dev/null
@@ -1,65 +0,0 @@
-
-package WSDiscovery::Elements::Resolve;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
-
-__PACKAGE__->__set_name('Resolve');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ResolveType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::Resolve
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-Resolve from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::Resolve->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::ResolveType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
-     Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
-     },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
-     },
-   },
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Typemaps/WSDiscovery.pm b/onvif/proxy/lib/WSDiscovery/Typemaps/WSDiscovery.pm
deleted file mode 100644
index 136550e96..000000000
--- a/onvif/proxy/lib/WSDiscovery/Typemaps/WSDiscovery.pm
+++ /dev/null
@@ -1,59 +0,0 @@
-
-package WSDiscovery::Typemaps::WSDiscovery;
-use strict;
-use warnings;
-
-our $typemap_1 = {
-               'ProbeMatches/ProbeMatch/XAddrs' => 'WSDiscovery::Types::UriListType',
-               'ProbeMatches/ProbeMatch' => 'WSDiscovery::Types::ProbeMatchType',
-               'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
-               'ProbeMatches/ProbeMatch/EndpointReference/Metadata' => 'WSDiscovery::Types::MetadataType',
-               'ProbeMatches/ProbeMatch/Scopes' => 'WSDiscovery::Types::ScopesType',
-               'ProbeMatches/ProbeMatch/EndpointReference/Address' => 'WSDiscovery::Types::AttributedURIType',
-               'Probe/Types' => 'WSDiscovery::Types::QNameListType',
-               'Probe' => 'WSDiscovery::Elements::Probe',
-               'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
-               'ProbeMatches/ProbeMatch/MetadataVersion' => 'SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt',
-               'Probe/Scopes' => 'WSDiscovery::Types::ScopesType',
-               'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
-               'Fault/faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
-               'ProbeMatches/ProbeMatch/Types' => 'WSDiscovery::Types::QNameListType',
-               'ProbeMatches/ProbeMatch/EndpointReference/ReferenceParameters' => 'WSDiscovery::Types::ReferenceParametersType',
-               'ProbeMatches/ProbeMatch/EndpointReference' => 'WSDiscovery::Types::EndpointReferenceType',
-               'Fault' => 'SOAP::WSDL::SOAP::Typelib::Fault11',
-               'ProbeMatches' => 'WSDiscovery::Elements::ProbeMatches',
-               'MessageID' => 'WSDiscovery::Elements::MessageID',
-               'RelatesTo' => '__SKIP__',
-               'To' => '__SKIP__',
-               'Action' => '__SKIP__',
-               'AppSequence' => '__SKIP__',
-              }; 
-;
-
-sub get_class {
-  my $name = join '/', @{ $_[1] };
-  return $typemap_1->{ $name };
-}
-
-sub get_typemap {
-    return $typemap_1;
-}
-
-1;
-
-__END__
-
-__END__
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Typemaps::WSDiscovery - typemap for WSDiscovery
-
-=head1 DESCRIPTION
-
-Typemap created by SOAP::WSDL for map-based SOAP message parsers.
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Types/EndpointReferenceType.pm b/onvif/proxy/lib/WSDiscovery/Types/EndpointReferenceType.pm
deleted file mode 100644
index 59411fa37..000000000
--- a/onvif/proxy/lib/WSDiscovery/Types/EndpointReferenceType.pm
+++ /dev/null
@@ -1,137 +0,0 @@
-package WSDiscovery::Types::EndpointReferenceType;
-use strict;
-use warnings;
-
-
-__PACKAGE__->_set_element_form_qualified(0);
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
-
-our $XML_ATTRIBUTE_CLASS;
-undef $XML_ATTRIBUTE_CLASS;
-
-sub __get_attr_class {
-    return $XML_ATTRIBUTE_CLASS;
-}
-
-use Class::Std::Fast::Storable constructor => 'none';
-use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
-
-Class::Std::initialize();
-
-{ # BLOCK to scope variables
-
-my %Address_of :ATTR(:get<Address>);
-my %ReferenceParameters_of :ATTR(:get<ReferenceParameters>);
-my %Metadata_of :ATTR(:get<Metadata>);
-
-__PACKAGE__->_factory(
-    [ qw(        Address
-        ReferenceParameters
-        Metadata
-
-    ) ],
-    {
-        'Address' => \%Address_of,
-        'ReferenceParameters' => \%ReferenceParameters_of,
-        'Metadata' => \%Metadata_of,
-    },
-    {
-        'Address' => 'WSDiscovery::Types::AttributedURIType',
-        'ReferenceParameters' => 'WSDiscovery::Elements::ReferenceParameters',
-
-        'Metadata' => 'WSDiscovery::Elements::Metadata',
-
-    },
-    {
-
-        'Address' => 'Address',
-        'ReferenceParameters' => '',
-        'Metadata' => '',
-    }
-);
-
-} # end BLOCK
-
-
-
-
-
-
-
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Types::EndpointReferenceType
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined complexType
-EndpointReferenceType from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-=head2 PROPERTIES
-
-The following properties may be accessed using get_PROPERTY / set_PROPERTY
-methods:
-
-=over
-
-=item * Address
-
-
-=item * ReferenceParameters
-
-Note: The name of this property has been altered, because it didn't match
-perl's notion of variable/subroutine names. The altered name is used in
-perl code only, XML output uses the original name:
-
- 
-
-
-=item * Metadata
-
-Note: The name of this property has been altered, because it didn't match
-perl's notion of variable/subroutine names. The altered name is used in
-perl code only, XML output uses the original name:
-
- 
-
-
-
-
-=back
-
-
-=head1 METHODS
-
-=head2 new
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::EndpointReferenceType
-   Address =>  { value => $some_value },
-   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
-   },
-   Metadata =>  { # WSDiscovery::Types::MetadataType
-   },
- },
-
-
-
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ProblemActionType.pm b/onvif/proxy/lib/WSDiscovery/Types/ProblemActionType.pm
deleted file mode 100644
index 1426017f4..000000000
--- a/onvif/proxy/lib/WSDiscovery/Types/ProblemActionType.pm
+++ /dev/null
@@ -1,119 +0,0 @@
-package WSDiscovery::Types::ProblemActionType;
-use strict;
-use warnings;
-
-
-__PACKAGE__->_set_element_form_qualified(0);
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
-
-our $XML_ATTRIBUTE_CLASS;
-undef $XML_ATTRIBUTE_CLASS;
-
-sub __get_attr_class {
-    return $XML_ATTRIBUTE_CLASS;
-}
-
-use Class::Std::Fast::Storable constructor => 'none';
-use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
-
-Class::Std::initialize();
-
-{ # BLOCK to scope variables
-
-my %Action_of :ATTR(:get<Action>);
-my %SoapAction_of :ATTR(:get<SoapAction>);
-
-__PACKAGE__->_factory(
-    [ qw(        Action
-        SoapAction
-
-    ) ],
-    {
-        'Action' => \%Action_of,
-        'SoapAction' => \%SoapAction_of,
-    },
-    {
-        'Action' => 'WSDiscovery::Elements::Action',
-
-        'SoapAction' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
-    },
-    {
-
-        'Action' => '',
-        'SoapAction' => 'SoapAction',
-    }
-);
-
-} # end BLOCK
-
-
-
-
-
-
-
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Types::ProblemActionType
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined complexType
-ProblemActionType from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-=head2 PROPERTIES
-
-The following properties may be accessed using get_PROPERTY / set_PROPERTY
-methods:
-
-=over
-
-=item * Action
-
-Note: The name of this property has been altered, because it didn't match
-perl's notion of variable/subroutine names. The altered name is used in
-perl code only, XML output uses the original name:
-
- 
-
-
-=item * SoapAction
-
-
-
-
-=back
-
-
-=head1 METHODS
-
-=head2 new
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::ProblemActionType
-   Action =>  { value => $some_value },
-   SoapAction =>  $some_value, # anyURI
- },
-
-
-
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Types/RelationshipTypeOpenEnum.pm b/onvif/proxy/lib/WSDiscovery/Types/RelationshipTypeOpenEnum.pm
deleted file mode 100644
index dc3e004c2..000000000
--- a/onvif/proxy/lib/WSDiscovery/Types/RelationshipTypeOpenEnum.pm
+++ /dev/null
@@ -1,76 +0,0 @@
-package WSDiscovery::Types::RelationshipTypeOpenEnum;
-use strict;
-use warnings;
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing'};
-
-# derivation by union
-# union is not fully supported yet - value space constraints are not
-# checked yet.
-# This implementation of union resorts to the simplest possible base, which
-# is: "If the <list> or <union> alternative is chosen, then the
-# simple ur-type definition·."
-#
-
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType
-);
-
-
-
-1;
-
-__END__
-
-=pod
-
-=head1 NAME
-
-
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined simpleType
-RelationshipTypeOpenEnum from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-This type class is derived by union.
-
-Derivation by union is not fully supported yet - value space constraints are
-not checked yet.
-
-The current implementation of union resorts to inheriting from the base type,
-which means (quoted from the XML Schema specs): "If the <list> or <union>
-alternative is chosen, then the simple ur-type definition·."
-
-
-
-=head1 METHODS
-
-=head2 new
-
-Constructor.
-
-=head2 get_value / set_value
-
-Getter and setter for the simpleType's value.
-
-=head1 OVERLOADING
-
-Depending on the simple type's base type, the following operations are overloaded
-
- Stringification
- Numerification
- Boolification
-
-Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Attributes/IsReferenceParameter.pm b/onvif/proxy/lib/WSDiscovery10/Attributes/Action.pm
similarity index 50%
rename from onvif/proxy/lib/WSDiscovery/Attributes/IsReferenceParameter.pm
rename to onvif/proxy/lib/WSDiscovery10/Attributes/Action.pm
index c04039b1f..84a19fd8c 100644
--- a/onvif/proxy/lib/WSDiscovery/Attributes/IsReferenceParameter.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Attributes/Action.pm
@@ -1,17 +1,17 @@
 
-package WSDiscovery::Attributes::IsReferenceParameter;
+package WSDiscovery10::Attributes::Action;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
 
-__PACKAGE__->__set_name('IsReferenceParameter');
+__PACKAGE__->__set_name('Action');
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Attribute
-    SOAP::WSDL::XSD::Typelib::Builtin::boolean
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
 );
 
 }
@@ -23,12 +23,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Attributes::IsReferenceParameter
+WSDiscovery10::Attributes::Action
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined attribute
-IsReferenceParameter from the namespace http://www.w3.org/2005/08/addressing.
+Action from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -40,7 +40,7 @@ IsReferenceParameter from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Attributes::IsReferenceParameter->new($data);
+ my $element = WSDiscovery10::Attributes::Action->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Attributes/Id.pm b/onvif/proxy/lib/WSDiscovery10/Attributes/Id.pm
similarity index 64%
rename from onvif/proxy/lib/WSDiscovery/Attributes/Id.pm
rename to onvif/proxy/lib/WSDiscovery10/Attributes/Id.pm
index 56d5115e4..97a3ee603 100644
--- a/onvif/proxy/lib/WSDiscovery/Attributes/Id.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Attributes/Id.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Attributes::Id;
+package WSDiscovery10::Attributes::Id;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Id');
 __PACKAGE__->__set_ref();
@@ -23,12 +23,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Attributes::Id
+WSDiscovery10::Attributes::Id
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined attribute
-Id from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Id from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -40,7 +40,7 @@ Id from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Attributes::Id->new($data);
+ my $element = WSDiscovery10::Attributes::Id->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Action.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Action.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Elements/Action.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Action.pm
index a24d6fdd9..141d1d8a9 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Action.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Action.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Action;
+package WSDiscovery10::Elements::Action;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
 
 __PACKAGE__->__set_name('Action');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedURIType
+    WSDiscovery10::Types::AttributedURI
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Action
+WSDiscovery10::Elements::Action
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Action from the namespace http://www.w3.org/2005/08/addressing.
+Action from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -43,7 +43,7 @@ Action from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Action->new($data);
+ my $element = WSDiscovery10::Elements::Action->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/AppSequence.pm b/onvif/proxy/lib/WSDiscovery10/Elements/AppSequence.pm
similarity index 58%
rename from onvif/proxy/lib/WSDiscovery/Elements/AppSequence.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/AppSequence.pm
index 63be6d678..d6662e940 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/AppSequence.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/AppSequence.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::AppSequence;
+package WSDiscovery10::Elements::AppSequence;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('AppSequence');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AppSequenceType
+    WSDiscovery10::Types::AppSequenceType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::AppSequence
+WSDiscovery10::Elements::AppSequence
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-AppSequence from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+AppSequence from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,11 +43,11 @@ AppSequence from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/200
 
 =head2 new
 
- my $element = WSDiscovery::Elements::AppSequence->new($data);
+ my $element = WSDiscovery10::Elements::AppSequence->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::AppSequenceType
+ { # WSDiscovery10::Types::AppSequenceType
  },
 
 =head1 AUTHOR
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Bye.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Bye.pm
similarity index 53%
rename from onvif/proxy/lib/WSDiscovery/Elements/Bye.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Bye.pm
index a89c3b48c..d5e15b25d 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Bye.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Bye.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Bye;
+package WSDiscovery10::Elements::Bye;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Bye');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ByeType
+    WSDiscovery10::Types::ByeType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Bye
+WSDiscovery10::Elements::Bye
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Bye from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Bye from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,17 +43,19 @@ Bye from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Bye->new($data);
+ my $element = WSDiscovery10::Elements::Bye->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ByeType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ByeType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/EndpointReference.pm b/onvif/proxy/lib/WSDiscovery10/Elements/EndpointReference.pm
new file mode 100644
index 000000000..105df00dd
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/EndpointReference.pm
@@ -0,0 +1,65 @@
+
+package WSDiscovery10::Elements::EndpointReference;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('EndpointReference');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::EndpointReference
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+EndpointReference from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::EndpointReference->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+   },
+   ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+   },
+   PortType =>  { value => $some_value },
+   ServiceName =>  { value => $some_value },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/FaultTo.pm b/onvif/proxy/lib/WSDiscovery10/Elements/FaultTo.pm
new file mode 100644
index 000000000..02235cfb8
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/FaultTo.pm
@@ -0,0 +1,65 @@
+
+package WSDiscovery10::Elements::FaultTo;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('FaultTo');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::FaultTo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+FaultTo from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::FaultTo->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+   },
+   ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+   },
+   PortType =>  { value => $some_value },
+   ServiceName =>  { value => $some_value },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/From.pm b/onvif/proxy/lib/WSDiscovery10/Elements/From.pm
new file mode 100644
index 000000000..ec56001f6
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/From.pm
@@ -0,0 +1,65 @@
+
+package WSDiscovery10::Elements::From;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('From');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::From
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+From from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::From->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+   },
+   ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+   },
+   PortType =>  { value => $some_value },
+   ServiceName =>  { value => $some_value },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Hello.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Hello.pm
similarity index 53%
rename from onvif/proxy/lib/WSDiscovery/Elements/Hello.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Hello.pm
index 894f8482d..783e051e0 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Hello.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Hello.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Hello;
+package WSDiscovery10::Elements::Hello;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Hello');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::HelloType
+    WSDiscovery10::Types::HelloType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Hello
+WSDiscovery10::Elements::Hello
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Hello from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Hello from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,17 +43,19 @@ Hello from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Hello->new($data);
+ my $element = WSDiscovery10::Elements::Hello->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::HelloType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::HelloType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/MessageID.pm b/onvif/proxy/lib/WSDiscovery10/Elements/MessageID.pm
similarity index 62%
rename from onvif/proxy/lib/WSDiscovery/Elements/MessageID.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/MessageID.pm
index 54dfa6a50..44ace37cd 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/MessageID.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/MessageID.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::MessageID;
+package WSDiscovery10::Elements::MessageID;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
 
 __PACKAGE__->__set_name('MessageID');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedURIType
+    WSDiscovery10::Types::AttributedURI
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::MessageID
+WSDiscovery10::Elements::MessageID
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-MessageID from the namespace http://www.w3.org/2005/08/addressing.
+MessageID from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -43,7 +43,7 @@ MessageID from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::MessageID->new($data);
+ my $element = WSDiscovery10::Elements::MessageID->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/MetadataVersion.pm b/onvif/proxy/lib/WSDiscovery10/Elements/MetadataVersion.pm
similarity index 65%
rename from onvif/proxy/lib/WSDiscovery/Elements/MetadataVersion.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/MetadataVersion.pm
index acb6c5246..bf56da261 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/MetadataVersion.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/MetadataVersion.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::MetadataVersion;
+package WSDiscovery10::Elements::MetadataVersion;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('MetadataVersion');
 __PACKAGE__->__set_nillable();
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::MetadataVersion
+WSDiscovery10::Elements::MetadataVersion
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-MetadataVersion from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+MetadataVersion from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,7 +43,7 @@ MetadataVersion from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery
 
 =head2 new
 
- my $element = WSDiscovery::Elements::MetadataVersion->new($data);
+ my $element = WSDiscovery10::Elements::MetadataVersion->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Probe.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Probe.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Elements/Probe.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Probe.pm
index b5b780a24..e07ec2510 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Probe.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Probe.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Probe;
+package WSDiscovery10::Elements::Probe;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Probe');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ProbeType
+    WSDiscovery10::Types::ProbeType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Probe
+WSDiscovery10::Elements::Probe
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Probe from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Probe from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,11 +43,11 @@ Probe from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Probe->new($data);
+ my $element = WSDiscovery10::Elements::Probe->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProbeType
+ { # WSDiscovery10::Types::ProbeType
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
  },
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ProbeMatches.pm b/onvif/proxy/lib/WSDiscovery10/Elements/ProbeMatches.pm
similarity index 50%
rename from onvif/proxy/lib/WSDiscovery/Elements/ProbeMatches.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/ProbeMatches.pm
index 5cf9f8fac..e64b8de42 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/ProbeMatches.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/ProbeMatches.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::ProbeMatches;
+package WSDiscovery10::Elements::ProbeMatches;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('ProbeMatches');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ProbeMatchesType
+    WSDiscovery10::Types::ProbeMatchesType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::ProbeMatches
+WSDiscovery10::Elements::ProbeMatches
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-ProbeMatches from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ProbeMatches from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,18 +43,20 @@ ProbeMatches from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/20
 
 =head2 new
 
- my $element = WSDiscovery::Elements::ProbeMatches->new($data);
+ my $element = WSDiscovery10::Elements::ProbeMatches->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProbeMatchesType
-   ProbeMatch =>  { # WSDiscovery::Types::ProbeMatchType
-     EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ProbeMatchesType
+   ProbeMatch =>  { # WSDiscovery10::Types::ProbeMatchType
+     EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
        Address =>  { value => $some_value },
-       ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+       ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
        },
-       Metadata =>  { # WSDiscovery::Types::MetadataType
+       ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
        },
+       PortType =>  { value => $some_value },
+       ServiceName =>  { value => $some_value },
      },
      Types => $some_value, # QNameListType
      Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/RelatesTo.pm b/onvif/proxy/lib/WSDiscovery10/Elements/RelatesTo.pm
similarity index 62%
rename from onvif/proxy/lib/WSDiscovery/Elements/RelatesTo.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/RelatesTo.pm
index ffdf501aa..51cc80a4f 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/RelatesTo.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/RelatesTo.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::RelatesTo;
+package WSDiscovery10::Elements::RelatesTo;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
 
 __PACKAGE__->__set_name('RelatesTo');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::RelatesToType
+    WSDiscovery10::Types::Relationship
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::RelatesTo
+WSDiscovery10::Elements::RelatesTo
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-RelatesTo from the namespace http://www.w3.org/2005/08/addressing.
+RelatesTo from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -43,7 +43,7 @@ RelatesTo from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::RelatesTo->new($data);
+ my $element = WSDiscovery10::Elements::RelatesTo->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ProblemIRI.pm b/onvif/proxy/lib/WSDiscovery10/Elements/ReplyAfter.pm
similarity index 57%
rename from onvif/proxy/lib/WSDiscovery/Elements/ProblemIRI.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/ReplyAfter.pm
index 70fe19410..4e0364477 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/ProblemIRI.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/ReplyAfter.pm
@@ -1,20 +1,20 @@
 
-package WSDiscovery::Elements::ProblemIRI;
+package WSDiscovery10::Elements::ReplyAfter;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
 
-__PACKAGE__->__set_name('ProblemIRI');
+__PACKAGE__->__set_name('ReplyAfter');
 __PACKAGE__->__set_nillable();
 __PACKAGE__->__set_minOccurs();
 __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedURIType
+    WSDiscovery10::Types::ReplyAfterType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::ProblemIRI
+WSDiscovery10::Elements::ReplyAfter
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-ProblemIRI from the namespace http://www.w3.org/2005/08/addressing.
+ReplyAfter from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -43,7 +43,7 @@ ProblemIRI from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::ProblemIRI->new($data);
+ my $element = WSDiscovery10::Elements::ReplyAfter->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/ReplyTo.pm b/onvif/proxy/lib/WSDiscovery10/Elements/ReplyTo.pm
new file mode 100644
index 000000000..4f4f2b496
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/ReplyTo.pm
@@ -0,0 +1,65 @@
+
+package WSDiscovery10::Elements::ReplyTo;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('ReplyTo');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::ReplyTo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ReplyTo from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::ReplyTo->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+   },
+   ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+   },
+   PortType =>  { value => $some_value },
+   ServiceName =>  { value => $some_value },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/Resolve.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Resolve.pm
new file mode 100644
index 000000000..17c834e4e
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Resolve.pm
@@ -0,0 +1,67 @@
+
+package WSDiscovery10::Elements::Resolve;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
+
+__PACKAGE__->__set_name('Resolve');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::ResolveType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::Resolve
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Resolve from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::Resolve->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::ResolveType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+     },
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+     },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ResolveMatches.pm b/onvif/proxy/lib/WSDiscovery10/Elements/ResolveMatches.pm
similarity index 50%
rename from onvif/proxy/lib/WSDiscovery/Elements/ResolveMatches.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/ResolveMatches.pm
index cfaabc989..c2ebe9979 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/ResolveMatches.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/ResolveMatches.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::ResolveMatches;
+package WSDiscovery10::Elements::ResolveMatches;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('ResolveMatches');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ResolveMatchesType
+    WSDiscovery10::Types::ResolveMatchesType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::ResolveMatches
+WSDiscovery10::Elements::ResolveMatches
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-ResolveMatches from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ResolveMatches from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,18 +43,20 @@ ResolveMatches from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/
 
 =head2 new
 
- my $element = WSDiscovery::Elements::ResolveMatches->new($data);
+ my $element = WSDiscovery10::Elements::ResolveMatches->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ResolveMatchesType
-   ResolveMatch =>  { # WSDiscovery::Types::ResolveMatchType
-     EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ResolveMatchesType
+   ResolveMatch =>  { # WSDiscovery10::Types::ResolveMatchType
+     EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
        Address =>  { value => $some_value },
-       ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+       ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
        },
-       Metadata =>  { # WSDiscovery::Types::MetadataType
+       ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
        },
+       PortType =>  { value => $some_value },
+       ServiceName =>  { value => $some_value },
      },
      Types => $some_value, # QNameListType
      Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/RetryAfter.pm b/onvif/proxy/lib/WSDiscovery10/Elements/RetryAfter.pm
similarity index 62%
rename from onvif/proxy/lib/WSDiscovery/Elements/RetryAfter.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/RetryAfter.pm
index 980eeab2d..8c43deb40 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/RetryAfter.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/RetryAfter.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::RetryAfter;
+package WSDiscovery10::Elements::RetryAfter;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
 
 __PACKAGE__->__set_name('RetryAfter');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedUnsignedLongType
+    WSDiscovery10::Types::RetryAfterType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::RetryAfter
+WSDiscovery10::Elements::RetryAfter
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-RetryAfter from the namespace http://www.w3.org/2005/08/addressing.
+RetryAfter from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -43,7 +43,7 @@ RetryAfter from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::RetryAfter->new($data);
+ my $element = WSDiscovery10::Elements::RetryAfter->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Scopes.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Scopes.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Elements/Scopes.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Scopes.pm
index 1dde55ce1..9aceeab7c 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Scopes.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Scopes.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Scopes;
+package WSDiscovery10::Elements::Scopes;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Scopes');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ScopesType
+    WSDiscovery10::Types::ScopesType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Scopes
+WSDiscovery10::Elements::Scopes
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Scopes from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Scopes from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,7 +43,7 @@ Scopes from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Scopes->new($data);
+ my $element = WSDiscovery10::Elements::Scopes->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Security.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Security.pm
similarity index 56%
rename from onvif/proxy/lib/WSDiscovery/Elements/Security.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Security.pm
index f9d4aff4d..6eeb876e7 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Security.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Security.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Security;
+package WSDiscovery10::Elements::Security;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Security');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::SecurityType
+    WSDiscovery10::Types::SecurityType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Security
+WSDiscovery10::Elements::Security
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Security from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Security from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,12 +43,12 @@ Security from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/0
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Security->new($data);
+ my $element = WSDiscovery10::Elements::Security->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::SecurityType
-   Sig =>  { # WSDiscovery::Types::SigType
+ { # WSDiscovery10::Types::SecurityType
+   Sig =>  { # WSDiscovery10::Types::SigType
    },
  },
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Sig.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Sig.pm
similarity index 61%
rename from onvif/proxy/lib/WSDiscovery/Elements/Sig.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Sig.pm
index 6ddab0bed..edfa22491 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Sig.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Sig.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Sig;
+package WSDiscovery10::Elements::Sig;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Sig');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::SigType
+    WSDiscovery10::Types::SigType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Sig
+WSDiscovery10::Elements::Sig
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Sig from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Sig from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,11 +43,11 @@ Sig from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Sig->new($data);
+ my $element = WSDiscovery10::Elements::Sig->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::SigType
+ { # WSDiscovery10::Types::SigType
  },
 
 =head1 AUTHOR
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/SupportedMatchingRules.pm b/onvif/proxy/lib/WSDiscovery10/Elements/SupportedMatchingRules.pm
similarity index 59%
rename from onvif/proxy/lib/WSDiscovery/Elements/SupportedMatchingRules.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/SupportedMatchingRules.pm
index 908566429..4b45ed553 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/SupportedMatchingRules.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/SupportedMatchingRules.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::SupportedMatchingRules;
+package WSDiscovery10::Elements::SupportedMatchingRules;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('SupportedMatchingRules');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::UriListType
+    WSDiscovery10::Types::UriListType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::SupportedMatchingRules
+WSDiscovery10::Elements::SupportedMatchingRules
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-SupportedMatchingRules from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+SupportedMatchingRules from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,7 +43,7 @@ SupportedMatchingRules from the namespace http://docs.oasis-open.org/ws-dd/ns/di
 
 =head2 new
 
- my $element = WSDiscovery::Elements::SupportedMatchingRules->new($data);
+ my $element = WSDiscovery10::Elements::SupportedMatchingRules->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/To.pm b/onvif/proxy/lib/WSDiscovery10/Elements/To.pm
similarity index 64%
rename from onvif/proxy/lib/WSDiscovery/Elements/To.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/To.pm
index d435b934d..52e2b7d1a 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/To.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/To.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::To;
+package WSDiscovery10::Elements::To;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
 
 __PACKAGE__->__set_name('To');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedURIType
+    WSDiscovery10::Types::AttributedURI
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::To
+WSDiscovery10::Elements::To
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-To from the namespace http://www.w3.org/2005/08/addressing.
+To from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -43,7 +43,7 @@ To from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::To->new($data);
+ my $element = WSDiscovery10::Elements::To->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Types.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Types.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Elements/Types.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Types.pm
index 15667a3a0..92c821480 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Types.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Types.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Types;
+package WSDiscovery10::Elements::Types;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Types');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::QNameListType
+    WSDiscovery10::Types::QNameListType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Types
+WSDiscovery10::Elements::Types
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Types from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Types from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,7 +43,7 @@ Types from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Types->new($data);
+ my $element = WSDiscovery10::Elements::Types->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/XAddrs.pm b/onvif/proxy/lib/WSDiscovery10/Elements/XAddrs.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Elements/XAddrs.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/XAddrs.pm
index bc0c8d998..2a43da505 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/XAddrs.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/XAddrs.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::XAddrs;
+package WSDiscovery10::Elements::XAddrs;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('XAddrs');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::UriListType
+    WSDiscovery10::Types::UriListType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::XAddrs
+WSDiscovery10::Elements::XAddrs
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-XAddrs from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+XAddrs from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,7 +43,7 @@ XAddrs from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::XAddrs->new($data);
+ my $element = WSDiscovery10::Elements::XAddrs->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Interfaces/WSDiscovery/WSDiscoveryPort.pm b/onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm
similarity index 72%
rename from onvif/proxy/lib/WSDiscovery/Interfaces/WSDiscovery/WSDiscoveryPort.pm
rename to onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm
index a7dcd3532..d194bbc87 100644
--- a/onvif/proxy/lib/WSDiscovery/Interfaces/WSDiscovery/WSDiscoveryPort.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm
@@ -1,4 +1,4 @@
-package WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort;
+package WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort;
 use strict;
 use warnings;
 use Class::Std::Fast::Storable;
@@ -6,12 +6,12 @@ use Scalar::Util qw(blessed);
 use base qw(SOAP::WSDL::Client::Base);
 
 # only load if it hasn't been loaded before
-require WSDiscovery::Typemaps::WSDiscovery
-    if not WSDiscovery::Typemaps::WSDiscovery->can('get_class');
+require WSDiscovery10::Typemaps::WSDiscovery
+    if not WSDiscovery10::Typemaps::WSDiscovery->can('get_class');
 
 sub START {
     $_[0]->set_proxy('soap.udp://239.255.255.250:3702/') if not $_[2]->{proxy};
-    $_[0]->set_class_resolver('WSDiscovery::Typemaps::WSDiscovery')
+    $_[0]->set_class_resolver('WSDiscovery10::Typemaps::WSDiscovery')
         if not $_[2]->{class_resolver};
 
     $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
@@ -22,7 +22,7 @@ sub ProbeOp {
     die "ProbeOp must be called as object method (\$self is <$self>)" if not blessed($self);
     return $self->SUPER::call({
         operation => 'ProbeOp',
-        soap_action => 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Probe',
+        soap_action => 'http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe',
         style => 'document',
         body => {
             
@@ -30,7 +30,7 @@ sub ProbeOp {
            'use'            => 'literal',
             namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
             encodingStyle   => '',
-            parts           =>  [qw( WSDiscovery::Elements::Probe )],
+            parts           =>  [qw( WSDiscovery10::Elements::Probe )],
 
         },
         header => {
@@ -55,12 +55,12 @@ __END__
 
 =head1 NAME
 
-WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort - SOAP Interface for the WSDiscovery Web Service
+WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort - SOAP Interface for the WSDiscovery Web Service
 
 =head1 SYNOPSIS
 
- use WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort;
- my $interface = WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort->new();
+ use WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort;
+ my $interface = WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort->new();
 
  my $response;
  $response = $interface->ProbeOp();
@@ -114,9 +114,9 @@ hash refs. See the respective class' documentation for additional information.
 
 
 
-Returns a L<WSDiscovery::Elements::ProbeMatches|WSDiscovery::Elements::ProbeMatches> object.
+Returns a L<WSDiscovery10::Elements::ProbeMatches|WSDiscovery10::Elements::ProbeMatches> object.
 
- $response = $interface->ProbeOp( { # WSDiscovery::Types::ProbeType
+ $response = $interface->ProbeOp( { # WSDiscovery10::Types::ProbeType
     Types => $some_value, # QNameListType
     Scopes =>  { value => $some_value },
   },,
@@ -126,6 +126,6 @@ Returns a L<WSDiscovery::Elements::ProbeMatches|WSDiscovery::Elements::ProbeMatc
 
 =head1 AUTHOR
 
-Generated by SOAP::WSDL on Wed Jul  2 11:45:24 2014
+Generated by SOAP::WSDL on Sat Mar 19 18:11:58 2016
 
 =cut
diff --git a/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm b/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm
new file mode 100644
index 000000000..635a19393
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm
@@ -0,0 +1,56 @@
+
+package WSDiscovery10::Typemaps::WSDiscovery;
+use strict;
+use warnings;
+
+our $typemap_1 = {
+               'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+               'Fault' => 'SOAP::WSDL::SOAP::Typelib::Fault11',
+               'Probe/Types' => 'WSDiscovery10::Types::QNameListType',
+               'ProbeMatches/ProbeMatch/EndpointReference/ReferenceParameters' => 'WSDiscovery10::Types::ReferenceParametersType',
+               'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'Probe/Scopes' => 'WSDiscovery10::Types::ScopesType',
+               'Fault/faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+               'ProbeMatches/ProbeMatch' => 'WSDiscovery10::Types::ProbeMatchType',
+               'ProbeMatches/ProbeMatch/MetadataVersion' => 'SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt',
+               'ProbeMatches/ProbeMatch/Scopes' => 'WSDiscovery10::Types::ScopesType',
+               'ProbeMatches' => 'WSDiscovery10::Elements::ProbeMatches',
+               'ProbeMatches/ProbeMatch/EndpointReference/ServiceName' => 'WSDiscovery10::Types::ServiceNameType',
+               'Probe' => 'WSDiscovery10::Elements::Probe',
+               'ProbeMatches/ProbeMatch/EndpointReference/Address' => 'WSDiscovery10::Types::AttributedURI',
+               'ProbeMatches/ProbeMatch/XAddrs' => 'WSDiscovery10::Types::UriListType',
+               'ProbeMatches/ProbeMatch/Types' => 'WSDiscovery10::Types::QNameListType',
+               'ProbeMatches/ProbeMatch/EndpointReference' => 'WSDiscovery10::Types::EndpointReferenceType',
+               'ProbeMatches/ProbeMatch/EndpointReference/ReferenceProperties' => 'WSDiscovery10::Types::ReferencePropertiesType',
+               'ProbeMatches/ProbeMatch/EndpointReference/PortType' => 'WSDiscovery10::Types::AttributedQName'
+             };
+;
+
+sub get_class {
+  my $name = join '/', @{ $_[1] };
+  return $typemap_1->{ $name };
+}
+
+sub get_typemap {
+    return $typemap_1;
+}
+
+1;
+
+__END__
+
+__END__
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Typemaps::WSDiscovery - typemap for WSDiscovery
+
+=head1 DESCRIPTION
+
+Typemap created by SOAP::WSDL for map-based SOAP message parsers.
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/AppSequenceType.pm b/onvif/proxy/lib/WSDiscovery10/Types/AppSequenceType.pm
similarity index 78%
rename from onvif/proxy/lib/WSDiscovery/Types/AppSequenceType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/AppSequenceType.pm
index 18e8ea8c3..d000bba34 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/AppSequenceType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/AppSequenceType.pm
@@ -1,13 +1,13 @@
-package WSDiscovery::Types::AppSequenceType;
+package WSDiscovery10::Types::AppSequenceType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
-our $XML_ATTRIBUTE_CLASS = 'WSDiscovery::Types::AppSequenceType::_AppSequenceType::XmlAttr';
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery10::Types::AppSequenceType::_AppSequenceType::XmlAttr';
 
 sub __get_attr_class {
     return $XML_ATTRIBUTE_CLASS;
@@ -15,7 +15,7 @@ sub __get_attr_class {
 
 use base qw();
 
-package WSDiscovery::Types::AppSequenceType::_AppSequenceType::XmlAttr;
+package WSDiscovery10::Types::AppSequenceType::_AppSequenceType::XmlAttr;
 use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
 
 { # BLOCK to scope variables
@@ -57,12 +57,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::AppSequenceType
+WSDiscovery10::Types::AppSequenceType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-AppSequenceType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+AppSequenceType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -87,7 +87,7 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::AppSequenceType
+ { # WSDiscovery10::Types::AppSequenceType
  },
 
 
@@ -99,7 +99,7 @@ See the correspondent WSDL/XML Schema if in question.
 
 This class has additional attributes, accessibly via the C<attr()> method.
 
-attr() returns an object of the class WSDiscovery::Types::AppSequenceType::_AppSequenceType::XmlAttr.
+attr() returns an object of the class WSDiscovery10::Types::AppSequenceType::_AppSequenceType::XmlAttr.
 
 The following attributes can be accessed on this object via the corresponding
 get_/set_ methods:
diff --git a/onvif/proxy/lib/WSDiscovery/Types/AttributedQNameType.pm b/onvif/proxy/lib/WSDiscovery10/Types/AttributedQName.pm
similarity index 74%
rename from onvif/proxy/lib/WSDiscovery/Types/AttributedQNameType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/AttributedQName.pm
index dd2d1522c..057b02374 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/AttributedQNameType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/AttributedQName.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::AttributedQNameType;
+package WSDiscovery10::Types::AttributedQName;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -30,12 +30,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Types::AttributedQNameType
+WSDiscovery10::Types::AttributedQName
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-AttributedQNameType from the namespace http://www.w3.org/2005/08/addressing.
+AttributedQName from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/AttributedURIType.pm b/onvif/proxy/lib/WSDiscovery10/Types/AttributedURI.pm
similarity index 75%
rename from onvif/proxy/lib/WSDiscovery/Types/AttributedURIType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/AttributedURI.pm
index 5cab1a8c9..841b730af 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/AttributedURIType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/AttributedURI.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::AttributedURIType;
+package WSDiscovery10::Types::AttributedURI;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -30,12 +30,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Types::AttributedURIType
+WSDiscovery10::Types::AttributedURI
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-AttributedURIType from the namespace http://www.w3.org/2005/08/addressing.
+AttributedURI from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ByeType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ByeType.pm
similarity index 76%
rename from onvif/proxy/lib/WSDiscovery/Types/ByeType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ByeType.pm
index 9c384fb2a..1cedf9c30 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ByeType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ByeType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ByeType;
+package WSDiscovery10::Types::ByeType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -43,15 +43,15 @@ __PACKAGE__->_factory(
         'MetadataVersion' => \%MetadataVersion_of,
     },
     {
-        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+        'EndpointReference' => 'WSDiscovery10::Elements::EndpointReference',
 
-        'Types' => 'WSDiscovery::Elements::Types',
+        'Types' => 'WSDiscovery10::Elements::Types',
 
-        'Scopes' => 'WSDiscovery::Elements::Scopes',
+        'Scopes' => 'WSDiscovery10::Elements::Scopes',
 
-        'XAddrs' => 'WSDiscovery::Elements::XAddrs',
+        'XAddrs' => 'WSDiscovery10::Elements::XAddrs',
 
-        'MetadataVersion' => 'WSDiscovery::Elements::MetadataVersion',
+        'MetadataVersion' => 'WSDiscovery10::Elements::MetadataVersion',
 
     },
     {
@@ -80,12 +80,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ByeType
+WSDiscovery10::Types::ByeType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ByeType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ByeType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -155,13 +155,15 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ByeType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ByeType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/EndpointReferenceType.pm b/onvif/proxy/lib/WSDiscovery10/Types/EndpointReferenceType.pm
new file mode 100644
index 000000000..9a96b103e
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/EndpointReferenceType.pm
@@ -0,0 +1,141 @@
+package WSDiscovery10::Types::EndpointReferenceType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Address_of :ATTR(:get<Address>);
+my %ReferenceProperties_of :ATTR(:get<ReferenceProperties>);
+my %ReferenceParameters_of :ATTR(:get<ReferenceParameters>);
+my %PortType_of :ATTR(:get<PortType>);
+my %ServiceName_of :ATTR(:get<ServiceName>);
+
+__PACKAGE__->_factory(
+    [ qw(        Address
+        ReferenceProperties
+        ReferenceParameters
+        PortType
+        ServiceName
+
+    ) ],
+    {
+        'Address' => \%Address_of,
+        'ReferenceProperties' => \%ReferenceProperties_of,
+        'ReferenceParameters' => \%ReferenceParameters_of,
+        'PortType' => \%PortType_of,
+        'ServiceName' => \%ServiceName_of,
+    },
+    {
+        'Address' => 'WSDiscovery10::Types::AttributedURI',
+        'ReferenceProperties' => 'WSDiscovery10::Types::ReferencePropertiesType',
+        'ReferenceParameters' => 'WSDiscovery10::Types::ReferenceParametersType',
+        'PortType' => 'WSDiscovery10::Types::AttributedQName',
+        'ServiceName' => 'WSDiscovery10::Types::ServiceNameType',
+    },
+    {
+
+        'Address' => 'Address',
+        'ReferenceProperties' => 'ReferenceProperties',
+        'ReferenceParameters' => 'ReferenceParameters',
+        'PortType' => 'PortType',
+        'ServiceName' => 'ServiceName',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Types::EndpointReferenceType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EndpointReferenceType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+If "Policy" elements from namespace "http://schemas.xmlsoap.org/ws/2002/12/policy#policy" are used, they must appear first (before any extensibility elements). 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Address
+
+
+=item * ReferenceProperties
+
+
+=item * ReferenceParameters
+
+
+=item * PortType
+
+
+=item * ServiceName
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+   },
+   ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+   },
+   PortType =>  { value => $some_value },
+   ServiceName =>  { value => $some_value },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/FaultCodeOpenType.pm b/onvif/proxy/lib/WSDiscovery10/Types/FaultCodeOpenType.pm
similarity index 85%
rename from onvif/proxy/lib/WSDiscovery/Types/FaultCodeOpenType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/FaultCodeOpenType.pm
index 52f5d2c8f..cd183e240 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/FaultCodeOpenType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/FaultCodeOpenType.pm
@@ -1,8 +1,8 @@
-package WSDiscovery::Types::FaultCodeOpenType;
+package WSDiscovery10::Types::FaultCodeOpenType;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
 
 # derivation by union
 # union is not fully supported yet - value space constraints are not
@@ -31,7 +31,7 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-FaultCodeOpenType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+FaultCodeOpenType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/FaultCodeType.pm b/onvif/proxy/lib/WSDiscovery10/Types/FaultCodeType.pm
similarity index 80%
rename from onvif/proxy/lib/WSDiscovery/Types/FaultCodeType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/FaultCodeType.pm
index 4cc63eb8b..13be77bdc 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/FaultCodeType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/FaultCodeType.pm
@@ -1,8 +1,8 @@
-package WSDiscovery::Types::FaultCodeType;
+package WSDiscovery10::Types::FaultCodeType;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
 
 # derivation by restriction
 use base qw(
@@ -23,7 +23,7 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-FaultCodeType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+FaultCodeType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/RelationshipType.pm b/onvif/proxy/lib/WSDiscovery10/Types/FaultSubcodeValues.pm
similarity index 71%
rename from onvif/proxy/lib/WSDiscovery/Types/RelationshipType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/FaultSubcodeValues.pm
index 022f9b27e..f49d7d269 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/RelationshipType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/FaultSubcodeValues.pm
@@ -1,12 +1,12 @@
-package WSDiscovery::Types::RelationshipType;
+package WSDiscovery10::Types::FaultSubcodeValues;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing'};
 
 # derivation by restriction
 use base qw(
-    SOAP::WSDL::XSD::Typelib::Builtin::anyURI);
+    SOAP::WSDL::XSD::Typelib::Builtin::QName);
 
 
 
@@ -23,14 +23,14 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-RelationshipType from the namespace http://www.w3.org/2005/08/addressing.
+FaultSubcodeValues from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
 
 
 This clase is derived from 
-   SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+   SOAP::WSDL::XSD::Typelib::Builtin::QName
 . SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
 like it's base type.
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/HelloType.pm b/onvif/proxy/lib/WSDiscovery10/Types/HelloType.pm
similarity index 76%
rename from onvif/proxy/lib/WSDiscovery/Types/HelloType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/HelloType.pm
index 1842faf6a..8cca31e90 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/HelloType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/HelloType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::HelloType;
+package WSDiscovery10::Types::HelloType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -43,15 +43,15 @@ __PACKAGE__->_factory(
         'MetadataVersion' => \%MetadataVersion_of,
     },
     {
-        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+        'EndpointReference' => 'WSDiscovery10::Elements::EndpointReference',
 
-        'Types' => 'WSDiscovery::Elements::Types',
+        'Types' => 'WSDiscovery10::Elements::Types',
 
-        'Scopes' => 'WSDiscovery::Elements::Scopes',
+        'Scopes' => 'WSDiscovery10::Elements::Scopes',
 
-        'XAddrs' => 'WSDiscovery::Elements::XAddrs',
+        'XAddrs' => 'WSDiscovery10::Elements::XAddrs',
 
-        'MetadataVersion' => 'WSDiscovery::Elements::MetadataVersion',
+        'MetadataVersion' => 'WSDiscovery10::Elements::MetadataVersion',
 
     },
     {
@@ -80,12 +80,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::HelloType
+WSDiscovery10::Types::HelloType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-HelloType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+HelloType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -155,13 +155,15 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::HelloType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::HelloType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/FaultCodesOpenEnumType.pm b/onvif/proxy/lib/WSDiscovery10/Types/OpenRelationshipType.pm
similarity index 85%
rename from onvif/proxy/lib/WSDiscovery/Types/FaultCodesOpenEnumType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/OpenRelationshipType.pm
index 89d8704e8..45aab20e5 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/FaultCodesOpenEnumType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/OpenRelationshipType.pm
@@ -1,8 +1,8 @@
-package WSDiscovery::Types::FaultCodesOpenEnumType;
+package WSDiscovery10::Types::OpenRelationshipType;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
 
 # derivation by union
 # union is not fully supported yet - value space constraints are not
@@ -31,7 +31,7 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-FaultCodesOpenEnumType from the namespace http://www.w3.org/2005/08/addressing.
+OpenRelationshipType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ProbeMatchType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchType.pm
similarity index 75%
rename from onvif/proxy/lib/WSDiscovery/Types/ProbeMatchType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchType.pm
index c85d98849..19bd18e88 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ProbeMatchType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ProbeMatchType;
+package WSDiscovery10::Types::ProbeMatchType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -43,15 +43,15 @@ __PACKAGE__->_factory(
         'MetadataVersion' => \%MetadataVersion_of,
     },
     {
-        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+        'EndpointReference' => 'WSDiscovery10::Elements::EndpointReference',
 
-        'Types' => 'WSDiscovery::Elements::Types',
+        'Types' => 'WSDiscovery10::Elements::Types',
 
-        'Scopes' => 'WSDiscovery::Elements::Scopes',
+        'Scopes' => 'WSDiscovery10::Elements::Scopes',
 
-        'XAddrs' => 'WSDiscovery::Elements::XAddrs',
+        'XAddrs' => 'WSDiscovery10::Elements::XAddrs',
 
-        'MetadataVersion' => 'WSDiscovery::Elements::MetadataVersion',
+        'MetadataVersion' => 'WSDiscovery10::Elements::MetadataVersion',
 
     },
     {
@@ -80,12 +80,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ProbeMatchType
+WSDiscovery10::Types::ProbeMatchType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ProbeMatchType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ProbeMatchType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -155,13 +155,15 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProbeMatchType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ProbeMatchType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ProbeMatchesType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchesType.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Types/ProbeMatchesType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchesType.pm
index 200edc6a4..20f101d03 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ProbeMatchesType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchesType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ProbeMatchesType;
+package WSDiscovery10::Types::ProbeMatchesType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -31,7 +31,7 @@ __PACKAGE__->_factory(
         'ProbeMatch' => \%ProbeMatch_of,
     },
     {
-        'ProbeMatch' => 'WSDiscovery::Types::ProbeMatchType',
+        'ProbeMatch' => 'WSDiscovery10::Types::ProbeMatchType',
     },
     {
 
@@ -55,12 +55,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ProbeMatchesType
+WSDiscovery10::Types::ProbeMatchesType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ProbeMatchesType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ProbeMatchesType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -88,14 +88,16 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProbeMatchesType
-   ProbeMatch =>  { # WSDiscovery::Types::ProbeMatchType
-     EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ProbeMatchesType
+   ProbeMatch =>  { # WSDiscovery10::Types::ProbeMatchType
+     EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
        Address =>  { value => $some_value },
-       ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+       ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
        },
-       Metadata =>  { # WSDiscovery::Types::MetadataType
+       ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
        },
+       PortType =>  { value => $some_value },
+       ServiceName =>  { value => $some_value },
      },
      Types => $some_value, # QNameListType
      Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ProbeType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ProbeType.pm
similarity index 81%
rename from onvif/proxy/lib/WSDiscovery/Types/ProbeType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ProbeType.pm
index 60dfa0bf3..10c290e8e 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ProbeType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ProbeType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ProbeType;
+package WSDiscovery10::Types::ProbeType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -34,9 +34,9 @@ __PACKAGE__->_factory(
         'Scopes' => \%Scopes_of,
     },
     {
-        'Types' => 'WSDiscovery::Elements::Types',
+        'Types' => 'WSDiscovery10::Elements::Types',
 
-        'Scopes' => 'WSDiscovery::Elements::Scopes',
+        'Scopes' => 'WSDiscovery10::Elements::Scopes',
 
     },
     {
@@ -62,12 +62,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ProbeType
+WSDiscovery10::Types::ProbeType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ProbeType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ProbeType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -110,7 +110,7 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProbeType
+ { # WSDiscovery10::Types::ProbeType
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
  },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/QNameListType.pm b/onvif/proxy/lib/WSDiscovery10/Types/QNameListType.pm
similarity index 81%
rename from onvif/proxy/lib/WSDiscovery/Types/QNameListType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/QNameListType.pm
index fef443675..79cffd694 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/QNameListType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/QNameListType.pm
@@ -1,8 +1,8 @@
-package WSDiscovery::Types::QNameListType;
+package WSDiscovery10::Types::QNameListType;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
 
 
 # list derivation
@@ -28,7 +28,7 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-QNameListType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+QNameListType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ReferenceParametersType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ReferenceParametersType.pm
similarity index 72%
rename from onvif/proxy/lib/WSDiscovery/Types/ReferenceParametersType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ReferenceParametersType.pm
index d6569a66b..fd5987604 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ReferenceParametersType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ReferenceParametersType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ReferenceParametersType;
+package WSDiscovery10::Types::ReferenceParametersType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -50,12 +50,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ReferenceParametersType
+WSDiscovery10::Types::ReferenceParametersType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ReferenceParametersType from the namespace http://www.w3.org/2005/08/addressing.
+ReferenceParametersType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -80,7 +80,7 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ReferenceParametersType
+ { # WSDiscovery10::Types::ReferenceParametersType
  },
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/MetadataType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ReferencePropertiesType.pm
similarity index 72%
rename from onvif/proxy/lib/WSDiscovery/Types/MetadataType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ReferencePropertiesType.pm
index 072161f78..9e3ba9add 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/MetadataType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ReferencePropertiesType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::MetadataType;
+package WSDiscovery10::Types::ReferencePropertiesType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -50,12 +50,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::MetadataType
+WSDiscovery10::Types::ReferencePropertiesType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-MetadataType from the namespace http://www.w3.org/2005/08/addressing.
+ReferencePropertiesType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -80,7 +80,7 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::MetadataType
+ { # WSDiscovery10::Types::ReferencePropertiesType
  },
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/RelatesToType.pm b/onvif/proxy/lib/WSDiscovery10/Types/Relationship.pm
similarity index 66%
rename from onvif/proxy/lib/WSDiscovery/Types/RelatesToType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/Relationship.pm
index 068d00ce6..3521517a8 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/RelatesToType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/Relationship.pm
@@ -1,13 +1,13 @@
-package WSDiscovery::Types::RelatesToType;
+package WSDiscovery10::Types::Relationship;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
 
-our $XML_ATTRIBUTE_CLASS = 'WSDiscovery::Types::RelatesToType::_RelatesToType::XmlAttr';
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery10::Types::Relationship::_Relationship::XmlAttr';
 
 sub __get_attr_class {
     return $XML_ATTRIBUTE_CLASS;
@@ -18,7 +18,7 @@ use base qw(
     SOAP::WSDL::XSD::Typelib::Builtin::anyURI
 );
 
-package WSDiscovery::Types::RelatesToType::_RelatesToType::XmlAttr;
+package WSDiscovery10::Types::Relationship::_Relationship::XmlAttr;
 use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
 
 { # BLOCK to scope variables
@@ -34,7 +34,7 @@ __PACKAGE__->_factory(
         RelationshipType => \%RelationshipType_of,
     },
     {
-        RelationshipType => 'WSDiscovery::Types::RelationshipTypeOpenEnum',
+        RelationshipType => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
     }
 );
 
@@ -50,12 +50,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::RelatesToType
+WSDiscovery10::Types::Relationship
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-RelatesToType from the namespace http://www.w3.org/2005/08/addressing.
+Relationship from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -91,7 +91,7 @@ See the correspondent WSDL/XML Schema if in question.
 
 This class has additional attributes, accessibly via the C<attr()> method.
 
-attr() returns an object of the class WSDiscovery::Types::RelatesToType::_RelatesToType::XmlAttr.
+attr() returns an object of the class WSDiscovery10::Types::Relationship::_Relationship::XmlAttr.
 
 The following attributes can be accessed on this object via the corresponding
 get_/set_ methods:
@@ -102,7 +102,7 @@ get_/set_ methods:
 
 
 
-This attribute is of type L<WSDiscovery::Types::RelationshipTypeOpenEnum|WSDiscovery::Types::RelationshipTypeOpenEnum>.
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::QName|SOAP::WSDL::XSD::Typelib::Builtin::QName>.
 
 
 =back
diff --git a/onvif/proxy/lib/WSDiscovery/Types/FaultCodesType.pm b/onvif/proxy/lib/WSDiscovery10/Types/RelationshipType.pm
similarity index 80%
rename from onvif/proxy/lib/WSDiscovery/Types/FaultCodesType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/RelationshipType.pm
index a042be3cf..b9d902573 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/FaultCodesType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/RelationshipType.pm
@@ -1,8 +1,8 @@
-package WSDiscovery::Types::FaultCodesType;
+package WSDiscovery10::Types::RelationshipType;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
 
 # derivation by restriction
 use base qw(
@@ -23,7 +23,7 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-FaultCodesType from the namespace http://www.w3.org/2005/08/addressing.
+RelationshipType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/RelationshipTypeValues.pm b/onvif/proxy/lib/WSDiscovery10/Types/RelationshipTypeValues.pm
new file mode 100644
index 000000000..125c4f2cd
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/RelationshipTypeValues.pm
@@ -0,0 +1,65 @@
+package WSDiscovery10::Types::RelationshipTypeValues;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::QName);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RelationshipTypeValues from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::QName
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/AttributedUnsignedLongType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ReplyAfterType.pm
similarity index 68%
rename from onvif/proxy/lib/WSDiscovery/Types/AttributedUnsignedLongType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ReplyAfterType.pm
index c2a947795..3f0c3ecf1 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/AttributedUnsignedLongType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ReplyAfterType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::AttributedUnsignedLongType;
+package WSDiscovery10::Types::ReplyAfterType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -16,7 +16,7 @@ sub __get_attr_class {
 
 use base qw(
     SOAP::WSDL::XSD::Typelib::ComplexType
-    SOAP::WSDL::XSD::Typelib::Builtin::unsignedLong
+    SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger
 );
 
 
@@ -30,12 +30,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Types::AttributedUnsignedLongType
+WSDiscovery10::Types::ReplyAfterType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-AttributedUnsignedLongType from the namespace http://www.w3.org/2005/08/addressing.
+ReplyAfterType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ResolveMatchType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchType.pm
similarity index 75%
rename from onvif/proxy/lib/WSDiscovery/Types/ResolveMatchType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchType.pm
index 03216f066..08e885408 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ResolveMatchType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ResolveMatchType;
+package WSDiscovery10::Types::ResolveMatchType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -43,15 +43,15 @@ __PACKAGE__->_factory(
         'MetadataVersion' => \%MetadataVersion_of,
     },
     {
-        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+        'EndpointReference' => 'WSDiscovery10::Elements::EndpointReference',
 
-        'Types' => 'WSDiscovery::Elements::Types',
+        'Types' => 'WSDiscovery10::Elements::Types',
 
-        'Scopes' => 'WSDiscovery::Elements::Scopes',
+        'Scopes' => 'WSDiscovery10::Elements::Scopes',
 
-        'XAddrs' => 'WSDiscovery::Elements::XAddrs',
+        'XAddrs' => 'WSDiscovery10::Elements::XAddrs',
 
-        'MetadataVersion' => 'WSDiscovery::Elements::MetadataVersion',
+        'MetadataVersion' => 'WSDiscovery10::Elements::MetadataVersion',
 
     },
     {
@@ -80,12 +80,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ResolveMatchType
+WSDiscovery10::Types::ResolveMatchType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ResolveMatchType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ResolveMatchType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -155,13 +155,15 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ResolveMatchType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ResolveMatchType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ResolveMatchesType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchesType.pm
similarity index 62%
rename from onvif/proxy/lib/WSDiscovery/Types/ResolveMatchesType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchesType.pm
index 3e0db0619..5ca08a7b1 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ResolveMatchesType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchesType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ResolveMatchesType;
+package WSDiscovery10::Types::ResolveMatchesType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -31,7 +31,7 @@ __PACKAGE__->_factory(
         'ResolveMatch' => \%ResolveMatch_of,
     },
     {
-        'ResolveMatch' => 'WSDiscovery::Types::ResolveMatchType',
+        'ResolveMatch' => 'WSDiscovery10::Types::ResolveMatchType',
     },
     {
 
@@ -55,12 +55,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ResolveMatchesType
+WSDiscovery10::Types::ResolveMatchesType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ResolveMatchesType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ResolveMatchesType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -88,14 +88,16 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ResolveMatchesType
-   ResolveMatch =>  { # WSDiscovery::Types::ResolveMatchType
-     EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ResolveMatchesType
+   ResolveMatch =>  { # WSDiscovery10::Types::ResolveMatchType
+     EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
        Address =>  { value => $some_value },
-       ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+       ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
        },
-       Metadata =>  { # WSDiscovery::Types::MetadataType
+       ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
        },
+       PortType =>  { value => $some_value },
+       ServiceName =>  { value => $some_value },
      },
      Types => $some_value, # QNameListType
      Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ResolveType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ResolveType.pm
similarity index 66%
rename from onvif/proxy/lib/WSDiscovery/Types/ResolveType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ResolveType.pm
index f1ddd13f5..87e8e8dbd 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ResolveType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ResolveType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ResolveType;
+package WSDiscovery10::Types::ResolveType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -31,7 +31,7 @@ __PACKAGE__->_factory(
         'EndpointReference' => \%EndpointReference_of,
     },
     {
-        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+        'EndpointReference' => 'WSDiscovery10::Elements::EndpointReference',
 
     },
     {
@@ -56,12 +56,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ResolveType
+WSDiscovery10::Types::ResolveType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ResolveType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ResolveType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -95,13 +95,15 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ResolveType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ResolveType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
  },
 
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/RetryAfterType.pm b/onvif/proxy/lib/WSDiscovery10/Types/RetryAfterType.pm
new file mode 100644
index 000000000..a878dc46c
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/RetryAfterType.pm
@@ -0,0 +1,73 @@
+package WSDiscovery10::Types::RetryAfterType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger
+);
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Types::RetryAfterType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RetryAfterType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ScopesType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ScopesType.pm
similarity index 73%
rename from onvif/proxy/lib/WSDiscovery/Types/ScopesType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ScopesType.pm
index 84cdfa057..c92029bcd 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ScopesType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ScopesType.pm
@@ -1,13 +1,13 @@
-package WSDiscovery::Types::ScopesType;
+package WSDiscovery10::Types::ScopesType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
-our $XML_ATTRIBUTE_CLASS = 'WSDiscovery::Types::ScopesType::_ScopesType::XmlAttr';
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery10::Types::ScopesType::_ScopesType::XmlAttr';
 
 sub __get_attr_class {
     return $XML_ATTRIBUTE_CLASS;
@@ -15,10 +15,10 @@ sub __get_attr_class {
 
 use base qw(
     SOAP::WSDL::XSD::Typelib::ComplexType
-    WSDiscovery::Types::UriListType
+    WSDiscovery10::Types::UriListType
 );
 
-package WSDiscovery::Types::ScopesType::_ScopesType::XmlAttr;
+package WSDiscovery10::Types::ScopesType::_ScopesType::XmlAttr;
 use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
 
 { # BLOCK to scope variables
@@ -50,12 +50,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ScopesType
+WSDiscovery10::Types::ScopesType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ScopesType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ScopesType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -91,7 +91,7 @@ See the correspondent WSDL/XML Schema if in question.
 
 This class has additional attributes, accessibly via the C<attr()> method.
 
-attr() returns an object of the class WSDiscovery::Types::ScopesType::_ScopesType::XmlAttr.
+attr() returns an object of the class WSDiscovery10::Types::ScopesType::_ScopesType::XmlAttr.
 
 The following attributes can be accessed on this object via the corresponding
 get_/set_ methods:
diff --git a/onvif/proxy/lib/WSDiscovery/Types/SecurityType.pm b/onvif/proxy/lib/WSDiscovery10/Types/SecurityType.pm
similarity index 75%
rename from onvif/proxy/lib/WSDiscovery/Types/SecurityType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/SecurityType.pm
index 968033307..01b18d2df 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/SecurityType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/SecurityType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::SecurityType;
+package WSDiscovery10::Types::SecurityType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -31,7 +31,7 @@ __PACKAGE__->_factory(
         'Sig' => \%Sig_of,
     },
     {
-        'Sig' => 'WSDiscovery::Elements::Sig',
+        'Sig' => 'WSDiscovery10::Elements::Sig',
 
     },
     {
@@ -56,12 +56,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::SecurityType
+WSDiscovery10::Types::SecurityType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-SecurityType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+SecurityType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -95,8 +95,8 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::SecurityType
-   Sig =>  { # WSDiscovery::Types::SigType
+ { # WSDiscovery10::Types::SecurityType
+   Sig =>  { # WSDiscovery10::Types::SigType
    },
  },
 
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/ServiceNameType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ServiceNameType.pm
new file mode 100644
index 000000000..d83e40608
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ServiceNameType.pm
@@ -0,0 +1,118 @@
+package WSDiscovery10::Types::ServiceNameType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery10::Types::ServiceNameType::_ServiceNameType::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::QName
+);
+
+package WSDiscovery10::Types::ServiceNameType::_ServiceNameType::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %PortName_of :ATTR(:get<PortName>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        PortName
+    ) ],
+    {
+
+        PortName => \%PortName_of,
+    },
+    {
+        PortName => 'SOAP::WSDL::XSD::Typelib::Builtin::NCName',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Types::ServiceNameType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ServiceNameType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSDiscovery10::Types::ServiceNameType::_ServiceNameType::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * PortName
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::NCName|SOAP::WSDL::XSD::Typelib::Builtin::NCName>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/SigType.pm b/onvif/proxy/lib/WSDiscovery10/Types/SigType.pm
similarity index 83%
rename from onvif/proxy/lib/WSDiscovery/Types/SigType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/SigType.pm
index 71eb613df..3db2ddcc5 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/SigType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/SigType.pm
@@ -1,13 +1,13 @@
-package WSDiscovery::Types::SigType;
+package WSDiscovery10::Types::SigType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
-our $XML_ATTRIBUTE_CLASS = 'WSDiscovery::Types::SigType::_SigType::XmlAttr';
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery10::Types::SigType::_SigType::XmlAttr';
 
 sub __get_attr_class {
     return $XML_ATTRIBUTE_CLASS;
@@ -38,7 +38,7 @@ __PACKAGE__->_factory(
 
 
 
-package WSDiscovery::Types::SigType::_SigType::XmlAttr;
+package WSDiscovery10::Types::SigType::_SigType::XmlAttr;
 use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
 
 { # BLOCK to scope variables
@@ -85,12 +85,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::SigType
+WSDiscovery10::Types::SigType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-SigType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+SigType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -115,7 +115,7 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::SigType
+ { # WSDiscovery10::Types::SigType
  },
 
 
@@ -127,7 +127,7 @@ See the correspondent WSDL/XML Schema if in question.
 
 This class has additional attributes, accessibly via the C<attr()> method.
 
-attr() returns an object of the class WSDiscovery::Types::SigType::_SigType::XmlAttr.
+attr() returns an object of the class WSDiscovery10::Types::SigType::_SigType::XmlAttr.
 
 The following attributes can be accessed on this object via the corresponding
 get_/set_ methods:
diff --git a/onvif/proxy/lib/WSDiscovery/Types/UriListType.pm b/onvif/proxy/lib/WSDiscovery10/Types/UriListType.pm
similarity index 81%
rename from onvif/proxy/lib/WSDiscovery/Types/UriListType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/UriListType.pm
index 1a04cfbee..c59a32f37 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/UriListType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/UriListType.pm
@@ -1,8 +1,8 @@
-package WSDiscovery::Types::UriListType;
+package WSDiscovery10::Types::UriListType;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
 
 
 # list derivation
@@ -28,7 +28,7 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-UriListType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+UriListType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
diff --git a/onvif/scripts/zmonvif-probe.pl b/onvif/scripts/zmonvif-probe.pl
index 8740fb7e6..b63f19a00 100755
--- a/onvif/scripts/zmonvif-probe.pl
+++ b/onvif/scripts/zmonvif-probe.pl
@@ -28,9 +28,9 @@ use Getopt::Std;
 
 require ONVIF::Client;
 
-require WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort;
-require WSDiscovery::Elements::Types;
-require WSDiscovery::Elements::Scopes;
+require WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort;
+require WSDiscovery10::Elements::Types;
+require WSDiscovery10::Elements::Scopes;
 
 require WSDiscovery::TransportUDP;
 
@@ -163,7 +163,7 @@ sub discover
   if($verbose) {
     print "Probing for SOAP 1.1\n"
   }
-  my $svc_discover = WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort->new({ 
+  my $svc_discover = WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort->new({ 
 #    no_dispatch => '1',
   });
   $svc_discover->set_soap_version('1.1');
@@ -182,7 +182,7 @@ sub discover
   if($verbose) {
     print "Probing for SOAP 1.2\n"
   }
-  $svc_discover = WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort->new({
+  $svc_discover = WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort->new({
 #    no_dispatch => '1',
   });
   $svc_discover->set_soap_version('1.2');