diff --git a/azure-mgmt-recoveryservices/MANIFEST.in b/azure-mgmt-recoveryservices/MANIFEST.in
index bb37a2723dae..6ceb27f7a96e 100644
--- a/azure-mgmt-recoveryservices/MANIFEST.in
+++ b/azure-mgmt-recoveryservices/MANIFEST.in
@@ -1 +1,4 @@
 include *.rst
+include azure/__init__.py
+include azure/mgmt/__init__.py
+
diff --git a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_and_aad_details.py b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_and_aad_details.py
index 521c0b2ab160..130274fd482b 100644
--- a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_and_aad_details.py
+++ b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_and_aad_details.py
@@ -19,7 +19,7 @@ class ResourceCertificateAndAadDetails(ResourceCertificateDetails):
 
     :param certificate: The base64 encoded certificate raw data string.
     :type certificate: bytearray
-    :param friendly_name: Certificate friendlyname.
+    :param friendly_name: Certificate friendly name.
     :type friendly_name: str
     :param issuer: Certificate issuer.
     :type issuer: str
diff --git a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_and_aad_details_py3.py b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_and_aad_details_py3.py
index 591a1d0ba44e..be2ce10e16d7 100644
--- a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_and_aad_details_py3.py
+++ b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_and_aad_details_py3.py
@@ -19,7 +19,7 @@ class ResourceCertificateAndAadDetails(ResourceCertificateDetails):
 
     :param certificate: The base64 encoded certificate raw data string.
     :type certificate: bytearray
-    :param friendly_name: Certificate friendlyname.
+    :param friendly_name: Certificate friendly name.
     :type friendly_name: str
     :param issuer: Certificate issuer.
     :type issuer: str
diff --git a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_and_acs_details.py b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_and_acs_details.py
index 69f3f03a1c6d..00cce4813886 100644
--- a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_and_acs_details.py
+++ b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_and_acs_details.py
@@ -19,7 +19,7 @@ class ResourceCertificateAndAcsDetails(ResourceCertificateDetails):
 
     :param certificate: The base64 encoded certificate raw data string.
     :type certificate: bytearray
-    :param friendly_name: Certificate friendlyname.
+    :param friendly_name: Certificate friendly name.
     :type friendly_name: str
     :param issuer: Certificate issuer.
     :type issuer: str
diff --git a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_and_acs_details_py3.py b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_and_acs_details_py3.py
index d53475e6f844..2edfe85d4699 100644
--- a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_and_acs_details_py3.py
+++ b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_and_acs_details_py3.py
@@ -19,7 +19,7 @@ class ResourceCertificateAndAcsDetails(ResourceCertificateDetails):
 
     :param certificate: The base64 encoded certificate raw data string.
     :type certificate: bytearray
-    :param friendly_name: Certificate friendlyname.
+    :param friendly_name: Certificate friendly name.
     :type friendly_name: str
     :param issuer: Certificate issuer.
     :type issuer: str
diff --git a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_details.py b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_details.py
index 8beadb8f04df..664ec6048fed 100644
--- a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_details.py
+++ b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_details.py
@@ -23,7 +23,7 @@ class ResourceCertificateDetails(Model):
 
     :param certificate: The base64 encoded certificate raw data string.
     :type certificate: bytearray
-    :param friendly_name: Certificate friendlyname.
+    :param friendly_name: Certificate friendly name.
     :type friendly_name: str
     :param issuer: Certificate issuer.
     :type issuer: str
diff --git a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_details_py3.py b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_details_py3.py
index 50799884c1ab..7da7ebf197c7 100644
--- a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_details_py3.py
+++ b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/resource_certificate_details_py3.py
@@ -23,7 +23,7 @@ class ResourceCertificateDetails(Model):
 
     :param certificate: The base64 encoded certificate raw data string.
     :type certificate: bytearray
-    :param friendly_name: Certificate friendlyname.
+    :param friendly_name: Certificate friendly name.
     :type friendly_name: str
     :param issuer: Certificate issuer.
     :type issuer: str
diff --git a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/upgrade_details.py b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/upgrade_details.py
index d1b79809e3e4..4c54724acb8f 100644
--- a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/upgrade_details.py
+++ b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/upgrade_details.py
@@ -34,7 +34,7 @@ class UpgradeDetails(Model):
     :ivar message: Message to the user containing information about the
      upgrade operation.
     :vartype message: str
-    :ivar trigger_type: The way the vault upgradation was triggered. Possible
+    :ivar trigger_type: The way the vault upgrade was triggered. Possible
      values include: 'UserTriggered', 'ForcedUpgrade'
     :vartype trigger_type: str or
      ~azure.mgmt.recoveryservices.models.TriggerType
diff --git a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/upgrade_details_py3.py b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/upgrade_details_py3.py
index fcfc8f1d6cf9..c3c176030cda 100644
--- a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/upgrade_details_py3.py
+++ b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/upgrade_details_py3.py
@@ -34,7 +34,7 @@ class UpgradeDetails(Model):
     :ivar message: Message to the user containing information about the
      upgrade operation.
     :vartype message: str
-    :ivar trigger_type: The way the vault upgradation was triggered. Possible
+    :ivar trigger_type: The way the vault upgrade was triggered. Possible
      values include: 'UserTriggered', 'ForcedUpgrade'
     :vartype trigger_type: str or
      ~azure.mgmt.recoveryservices.models.TriggerType
diff --git a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/operations.py b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/operations.py
index 45dfbe46af48..84c4a236e8e1 100644
--- a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/operations.py
+++ b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/operations.py
@@ -67,7 +67,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -76,9 +76,8 @@ def internal_paging(next_link=None, raw=False):
                 header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
             # Construct and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
diff --git a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/registered_identities_operations.py b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/registered_identities_operations.py
index cf9f9829ef5e..80f05d799142 100644
--- a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/registered_identities_operations.py
+++ b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/registered_identities_operations.py
@@ -73,7 +73,6 @@ def delete(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -82,8 +81,8 @@ def delete(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.delete(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.delete(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [204]:
             exp = CloudError(response)
diff --git a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/replication_usages_operations.py b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/replication_usages_operations.py
index fbadd6408dce..9139ffb0c385 100644
--- a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/replication_usages_operations.py
+++ b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/replication_usages_operations.py
@@ -78,7 +78,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -87,9 +87,8 @@ def internal_paging(next_link=None, raw=False):
                 header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
             # Construct and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
diff --git a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/usages_operations.py b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/usages_operations.py
index 9ab6c5de79de..8c9b1ce2c7ea 100644
--- a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/usages_operations.py
+++ b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/usages_operations.py
@@ -78,7 +78,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -87,9 +87,8 @@ def internal_paging(next_link=None, raw=False):
                 header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
             # Construct and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
diff --git a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/vault_certificates_operations.py b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/vault_certificates_operations.py
index 8523ff8ecac2..4e8e3d1f162f 100644
--- a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/vault_certificates_operations.py
+++ b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/vault_certificates_operations.py
@@ -79,6 +79,7 @@ def create(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         header_parameters['Content-Type'] = 'application/json; charset=utf-8'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
@@ -91,9 +92,8 @@ def create(
         body_content = self._serialize.body(certificate_request, 'CertificateRequest')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.put(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
diff --git a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/vault_extended_info_operations.py b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/vault_extended_info_operations.py
index c672aacb65e2..49f2ffe02a5d 100644
--- a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/vault_extended_info_operations.py
+++ b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/vault_extended_info_operations.py
@@ -71,7 +71,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -80,8 +80,8 @@ def get(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -138,6 +138,7 @@ def create_or_update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         header_parameters['Content-Type'] = 'application/json; charset=utf-8'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
@@ -150,9 +151,8 @@ def create_or_update(
         body_content = self._serialize.body(resource_resource_extended_info_details, 'VaultExtendedInfoResource')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.put(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -209,6 +209,7 @@ def update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         header_parameters['Content-Type'] = 'application/json; charset=utf-8'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
@@ -221,9 +222,8 @@ def update(
         body_content = self._serialize.body(resource_resource_extended_info_details, 'VaultExtendedInfoResource')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.patch(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
diff --git a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/vaults_operations.py b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/vaults_operations.py
index b844fa2f8374..248187627d55 100644
--- a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/vaults_operations.py
+++ b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/vaults_operations.py
@@ -71,7 +71,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -80,9 +80,8 @@ def internal_paging(next_link=None, raw=False):
                 header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
             # Construct and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -140,7 +139,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -149,9 +148,8 @@ def internal_paging(next_link=None, raw=False):
                 header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
             # Construct and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -205,7 +203,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -214,8 +212,8 @@ def get(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -270,6 +268,7 @@ def create_or_update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         header_parameters['Content-Type'] = 'application/json; charset=utf-8'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
@@ -282,9 +281,8 @@ def create_or_update(
         body_content = self._serialize.body(vault, 'Vault')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.put(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 201]:
             exp = CloudError(response)
@@ -338,7 +336,6 @@ def delete(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -347,8 +344,8 @@ def delete(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.delete(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.delete(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -396,6 +393,7 @@ def update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         header_parameters['Content-Type'] = 'application/json; charset=utf-8'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
@@ -408,9 +406,8 @@ def update(
         body_content = self._serialize.body(vault, 'PatchVault')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.patch(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 201]:
             exp = CloudError(response)
diff --git a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/version.py b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/version.py
index 3e682bbd5fb1..b2fd3a7ffa39 100644
--- a/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/version.py
+++ b/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/version.py
@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "0.3.0"
+VERSION = "2016-06-01"