Regen client against juju-2.0.2
[osm/N2VC.git] / juju / client / _client.py
index a792fd9..69fbc4c 100644 (file)
@@ -5,12 +5,12 @@ from juju.client.facade import Type, ReturnMapping
 
 
 class Action(Type):
-    _toSchema = {'parameters': 'parameters', 'receiver': 'receiver', 'tag': 'tag', 'name': 'name'}
-    _toPy = {'parameters': 'parameters', 'receiver': 'receiver', 'tag': 'tag', 'name': 'name'}
+    _toSchema = {'name': 'name', 'parameters': 'parameters', 'receiver': 'receiver', 'tag': 'tag'}
+    _toPy = {'name': 'name', 'parameters': 'parameters', 'receiver': 'receiver', 'tag': 'tag'}
     def __init__(self, name=None, parameters=None, receiver=None, tag=None):
         '''
         name : str
-        parameters : typing.Mapping[str, typing.Any]
+        parameters : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         receiver : str
         tag : str
         '''
@@ -21,8 +21,8 @@ class Action(Type):
 
 
 class ActionResult(Type):
-    _toSchema = {'action': 'action', 'completed': 'completed', 'output': 'output', 'started': 'started', 'enqueued': 'enqueued', 'message': 'message', 'error': 'error', 'status': 'status'}
-    _toPy = {'action': 'action', 'completed': 'completed', 'output': 'output', 'started': 'started', 'enqueued': 'enqueued', 'message': 'message', 'error': 'error', 'status': 'status'}
+    _toSchema = {'action': 'action', 'completed': 'completed', 'enqueued': 'enqueued', 'error': 'error', 'message': 'message', 'output': 'output', 'started': 'started', 'status': 'status'}
+    _toPy = {'action': 'action', 'completed': 'completed', 'enqueued': 'enqueued', 'error': 'error', 'message': 'message', 'output': 'output', 'started': 'started', 'status': 'status'}
     def __init__(self, action=None, completed=None, enqueued=None, error=None, message=None, output=None, started=None, status=None):
         '''
         action : Action
@@ -30,7 +30,7 @@ class ActionResult(Type):
         enqueued : str
         error : Error
         message : str
-        output : typing.Mapping[str, typing.Any]
+        output : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         started : str
         status : str
         '''
@@ -49,39 +49,39 @@ class ActionResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ActionResult]
+        results : typing.Sequence<+T_co>[~ActionResult]<~ActionResult>
         '''
         self.results = [ActionResult.from_json(o) for o in results or []]
 
 
 class ActionSpec(Type):
-    _toSchema = {'description': 'Description', 'params': 'Params'}
-    _toPy = {'Description': 'description', 'Params': 'params'}
+    _toSchema = {'description': 'description', 'params': 'params'}
+    _toPy = {'description': 'description', 'params': 'params'}
     def __init__(self, description=None, params=None):
         '''
         description : str
-        params : typing.Mapping[str, typing.Any]
+        params : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         '''
         self.description = description
         self.params = params
 
 
 class Actions(Type):
-    _toSchema = {'actionspecs': 'ActionSpecs'}
-    _toPy = {'ActionSpecs': 'actionspecs'}
-    def __init__(self, actionspecs=None):
+    _toSchema = {'actions': 'actions'}
+    _toPy = {'actions': 'actions'}
+    def __init__(self, actions=None):
         '''
-        actionspecs : typing.Mapping[str, ~ActionSpec]
+        actions : typing.Sequence<+T_co>[~Action]<~Action>
         '''
-        self.actionspecs = {k: ActionSpec.from_json(v) for k, v in (actionspecs or dict()).items()}
+        self.actions = [Action.from_json(o) for o in actions or []]
 
 
 class ActionsByName(Type):
-    _toSchema = {'name': 'name', 'actions': 'actions', 'error': 'error'}
-    _toPy = {'name': 'name', 'actions': 'actions', 'error': 'error'}
+    _toSchema = {'actions': 'actions', 'error': 'error', 'name': 'name'}
+    _toPy = {'actions': 'actions', 'error': 'error', 'name': 'name'}
     def __init__(self, actions=None, error=None, name=None):
         '''
-        actions : typing.Sequence[~ActionResult]
+        actions : typing.Sequence<+T_co>[~ActionResult]<~ActionResult>
         error : Error
         name : str
         '''
@@ -95,17 +95,17 @@ class ActionsByNames(Type):
     _toPy = {'actions': 'actions'}
     def __init__(self, actions=None):
         '''
-        actions : typing.Sequence[~ActionsByName]
+        actions : typing.Sequence<+T_co>[~ActionsByName]<~ActionsByName>
         '''
         self.actions = [ActionsByName.from_json(o) for o in actions or []]
 
 
 class ActionsByReceiver(Type):
-    _toSchema = {'receiver': 'receiver', 'actions': 'actions', 'error': 'error'}
-    _toPy = {'receiver': 'receiver', 'actions': 'actions', 'error': 'error'}
+    _toSchema = {'actions': 'actions', 'error': 'error', 'receiver': 'receiver'}
+    _toPy = {'actions': 'actions', 'error': 'error', 'receiver': 'receiver'}
     def __init__(self, actions=None, error=None, receiver=None):
         '''
-        actions : typing.Sequence[~ActionResult]
+        actions : typing.Sequence<+T_co>[~ActionResult]<~ActionResult>
         error : Error
         receiver : str
         '''
@@ -119,22 +119,22 @@ class ActionsByReceivers(Type):
     _toPy = {'actions': 'actions'}
     def __init__(self, actions=None):
         '''
-        actions : typing.Sequence[~ActionsByReceiver]
+        actions : typing.Sequence<+T_co>[~ActionsByReceiver]<~ActionsByReceiver>
         '''
         self.actions = [ActionsByReceiver.from_json(o) for o in actions or []]
 
 
 class ApplicationCharmActionsResult(Type):
-    _toSchema = {'applicationtag': 'ApplicationTag', 'actions': 'actions', 'error': 'error'}
-    _toPy = {'actions': 'actions', 'ApplicationTag': 'applicationtag', 'error': 'error'}
-    def __init__(self, applicationtag=None, actions=None, error=None):
+    _toSchema = {'actions': 'actions', 'application_tag': 'application-tag', 'error': 'error'}
+    _toPy = {'actions': 'actions', 'application-tag': 'application_tag', 'error': 'error'}
+    def __init__(self, actions=None, application_tag=None, error=None):
         '''
-        applicationtag : str
-        actions : Actions
+        actions : typing.Mapping<~KT, +VT_co>[str, ~ActionSpec]<~ActionSpec>
+        application_tag : str
         error : Error
         '''
-        self.applicationtag = applicationtag
-        self.actions = Actions.from_json(actions) if actions else None
+        self.actions = actions
+        self.application_tag = application_tag
         self.error = Error.from_json(error) if error else None
 
 
@@ -143,24 +143,24 @@ class ApplicationsCharmActionsResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ApplicationCharmActionsResult]
+        results : typing.Sequence<+T_co>[~ApplicationCharmActionsResult]<~ApplicationCharmActionsResult>
         '''
         self.results = [ApplicationCharmActionsResult.from_json(o) for o in results or []]
 
 
 class Entities(Type):
-    _toSchema = {'entities': 'Entities'}
-    _toPy = {'Entities': 'entities'}
+    _toSchema = {'entities': 'entities'}
+    _toPy = {'entities': 'entities'}
     def __init__(self, entities=None):
         '''
-        entities : typing.Sequence[~Entity]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
         '''
         self.entities = [Entity.from_json(o) for o in entities or []]
 
 
 class Entity(Type):
-    _toSchema = {'tag': 'Tag'}
-    _toPy = {'Tag': 'tag'}
+    _toSchema = {'tag': 'tag'}
+    _toPy = {'tag': 'tag'}
     def __init__(self, tag=None):
         '''
         tag : str
@@ -169,8 +169,8 @@ class Entity(Type):
 
 
 class Error(Type):
-    _toSchema = {'code': 'Code', 'message': 'Message', 'info': 'Info'}
-    _toPy = {'Code': 'code', 'Message': 'message', 'Info': 'info'}
+    _toSchema = {'code': 'code', 'info': 'info', 'message': 'message'}
+    _toPy = {'code': 'code', 'info': 'info', 'message': 'message'}
     def __init__(self, code=None, info=None, message=None):
         '''
         code : str
@@ -183,15 +183,15 @@ class Error(Type):
 
 
 class ErrorInfo(Type):
-    _toSchema = {'macaroonpath': 'MacaroonPath', 'macaroon': 'Macaroon'}
-    _toPy = {'Macaroon': 'macaroon', 'MacaroonPath': 'macaroonpath'}
-    def __init__(self, macaroon=None, macaroonpath=None):
+    _toSchema = {'macaroon': 'macaroon', 'macaroon_path': 'macaroon-path'}
+    _toPy = {'macaroon': 'macaroon', 'macaroon-path': 'macaroon_path'}
+    def __init__(self, macaroon=None, macaroon_path=None):
         '''
         macaroon : Macaroon
-        macaroonpath : str
+        macaroon_path : str
         '''
         self.macaroon = Macaroon.from_json(macaroon) if macaroon else None
-        self.macaroonpath = macaroonpath
+        self.macaroon_path = macaroon_path
 
 
 class FindActionsByNames(Type):
@@ -199,7 +199,7 @@ class FindActionsByNames(Type):
     _toPy = {'names': 'names'}
     def __init__(self, names=None):
         '''
-        names : typing.Sequence[str]
+        names : typing.Sequence<+T_co>[str]
         '''
         self.names = names
 
@@ -209,7 +209,7 @@ class FindTags(Type):
     _toPy = {'prefixes': 'prefixes'}
     def __init__(self, prefixes=None):
         '''
-        prefixes : typing.Sequence[str]
+        prefixes : typing.Sequence<+T_co>[str]
         '''
         self.prefixes = prefixes
 
@@ -219,39 +219,31 @@ class FindTagsResults(Type):
     _toPy = {'matches': 'matches'}
     def __init__(self, matches=None):
         '''
-        matches : typing.Sequence[~Entity]
+        matches : typing.Sequence<+T_co>[~Entity]<~Entity>
         '''
         self.matches = [Entity.from_json(o) for o in matches or []]
 
 
 class Macaroon(Type):
-    _toSchema = {'caveats': 'caveats', 'location': 'location', 'data': 'data', 'id_': 'id', 'sig': 'sig'}
-    _toPy = {'caveats': 'caveats', 'location': 'location', 'data': 'data', 'sig': 'sig', 'id': 'id_'}
-    def __init__(self, caveats=None, data=None, id_=None, location=None, sig=None):
+    _toSchema = {}
+    _toPy = {}
+    def __init__(self):
         '''
-        caveats : typing.Sequence[~caveat]
-        data : typing.Sequence[int]
-        id_ : packet
-        location : packet
-        sig : typing.Sequence[int]
+
         '''
-        self.caveats = [caveat.from_json(o) for o in caveats or []]
-        self.data = data
-        self.id_ = packet.from_json(id_) if id_ else None
-        self.location = packet.from_json(location) if location else None
-        self.sig = sig
+        pass
 
 
 class RunParams(Type):
-    _toSchema = {'units': 'Units', 'applications': 'Applications', 'commands': 'Commands', 'machines': 'Machines', 'timeout': 'Timeout'}
-    _toPy = {'Applications': 'applications', 'Commands': 'commands', 'Timeout': 'timeout', 'Units': 'units', 'Machines': 'machines'}
+    _toSchema = {'applications': 'applications', 'commands': 'commands', 'machines': 'machines', 'timeout': 'timeout', 'units': 'units'}
+    _toPy = {'applications': 'applications', 'commands': 'commands', 'machines': 'machines', 'timeout': 'timeout', 'units': 'units'}
     def __init__(self, applications=None, commands=None, machines=None, timeout=None, units=None):
         '''
-        applications : typing.Sequence[str]
+        applications : typing.Sequence<+T_co>[str]
         commands : str
-        machines : typing.Sequence[str]
+        machines : typing.Sequence<+T_co>[str]
         timeout : int
-        units : typing.Sequence[str]
+        units : typing.Sequence<+T_co>[str]
         '''
         self.applications = applications
         self.commands = commands
@@ -260,103 +252,103 @@ class RunParams(Type):
         self.units = units
 
 
-class caveat(Type):
-    _toSchema = {'caveatid': 'caveatId', 'location': 'location', 'verificationid': 'verificationId'}
-    _toPy = {'verificationId': 'verificationid', 'location': 'location', 'caveatId': 'caveatid'}
-    def __init__(self, caveatid=None, location=None, verificationid=None):
+class AgentGetEntitiesResult(Type):
+    _toSchema = {'container_type': 'container-type', 'error': 'error', 'jobs': 'jobs', 'life': 'life'}
+    _toPy = {'container-type': 'container_type', 'error': 'error', 'jobs': 'jobs', 'life': 'life'}
+    def __init__(self, container_type=None, error=None, jobs=None, life=None):
         '''
-        caveatid : packet
-        location : packet
-        verificationid : packet
+        container_type : str
+        error : Error
+        jobs : typing.Sequence<+T_co>[str]
+        life : str
         '''
-        self.caveatid = packet.from_json(caveatid) if caveatid else None
-        self.location = packet.from_json(location) if location else None
-        self.verificationid = packet.from_json(verificationid) if verificationid else None
+        self.container_type = container_type
+        self.error = Error.from_json(error) if error else None
+        self.jobs = jobs
+        self.life = life
 
 
-class packet(Type):
-    _toSchema = {'start': 'start', 'totallen': 'totalLen', 'headerlen': 'headerLen'}
-    _toPy = {'start': 'start', 'totalLen': 'totallen', 'headerLen': 'headerlen'}
-    def __init__(self, headerlen=None, start=None, totallen=None):
+class AgentGetEntitiesResults(Type):
+    _toSchema = {'entities': 'entities'}
+    _toPy = {'entities': 'entities'}
+    def __init__(self, entities=None):
         '''
-        headerlen : int
-        start : int
-        totallen : int
+        entities : typing.Sequence<+T_co>[~AgentGetEntitiesResult]<~AgentGetEntitiesResult>
         '''
-        self.headerlen = headerlen
-        self.start = start
-        self.totallen = totallen
+        self.entities = [AgentGetEntitiesResult.from_json(o) for o in entities or []]
 
 
-class BoolResult(Type):
-    _toSchema = {'result': 'Result', 'error': 'Error'}
-    _toPy = {'Result': 'result', 'Error': 'error'}
-    def __init__(self, error=None, result=None):
+class CloudCredential(Type):
+    _toSchema = {'attrs': 'attrs', 'auth_type': 'auth-type', 'redacted': 'redacted'}
+    _toPy = {'attrs': 'attrs', 'auth-type': 'auth_type', 'redacted': 'redacted'}
+    def __init__(self, attrs=None, auth_type=None, redacted=None):
         '''
-        error : Error
-        result : bool
+        attrs : typing.Mapping<~KT, +VT_co>[str, str]
+        auth_type : str
+        redacted : typing.Sequence<+T_co>[str]
         '''
-        self.error = Error.from_json(error) if error else None
-        self.result = result
+        self.attrs = attrs
+        self.auth_type = auth_type
+        self.redacted = redacted
 
 
-class EntitiesWatchResult(Type):
-    _toSchema = {'changes': 'Changes', 'error': 'Error', 'entitywatcherid': 'EntityWatcherId'}
-    _toPy = {'Changes': 'changes', 'Error': 'error', 'EntityWatcherId': 'entitywatcherid'}
-    def __init__(self, changes=None, entitywatcherid=None, error=None):
+class CloudSpec(Type):
+    _toSchema = {'credential': 'credential', 'endpoint': 'endpoint', 'identity_endpoint': 'identity-endpoint', 'name': 'name', 'region': 'region', 'storage_endpoint': 'storage-endpoint', 'type_': 'type'}
+    _toPy = {'credential': 'credential', 'endpoint': 'endpoint', 'identity-endpoint': 'identity_endpoint', 'name': 'name', 'region': 'region', 'storage-endpoint': 'storage_endpoint', 'type': 'type_'}
+    def __init__(self, credential=None, endpoint=None, identity_endpoint=None, name=None, region=None, storage_endpoint=None, type_=None):
         '''
-        changes : typing.Sequence[str]
-        entitywatcherid : str
-        error : Error
+        credential : CloudCredential
+        endpoint : str
+        identity_endpoint : str
+        name : str
+        region : str
+        storage_endpoint : str
+        type_ : str
         '''
-        self.changes = changes
-        self.entitywatcherid = entitywatcherid
-        self.error = Error.from_json(error) if error else None
+        self.credential = CloudCredential.from_json(credential) if credential else None
+        self.endpoint = endpoint
+        self.identity_endpoint = identity_endpoint
+        self.name = name
+        self.region = region
+        self.storage_endpoint = storage_endpoint
+        self.type_ = type_
 
 
-class ErrorResult(Type):
-    _toSchema = {'code': 'Code', 'message': 'Message', 'info': 'Info'}
-    _toPy = {'Code': 'code', 'Message': 'message', 'Info': 'info'}
-    def __init__(self, code=None, info=None, message=None):
+class CloudSpecResult(Type):
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
+    def __init__(self, error=None, result=None):
         '''
-        code : str
-        info : ErrorInfo
-        message : str
+        error : Error
+        result : CloudSpec
         '''
-        self.code = code
-        self.info = ErrorInfo.from_json(info) if info else None
-        self.message = message
+        self.error = Error.from_json(error) if error else None
+        self.result = CloudSpec.from_json(result) if result else None
 
 
-class AgentGetEntitiesResult(Type):
-    _toSchema = {'jobs': 'Jobs', 'life': 'Life', 'error': 'Error', 'containertype': 'ContainerType'}
-    _toPy = {'Life': 'life', 'ContainerType': 'containertype', 'Error': 'error', 'Jobs': 'jobs'}
-    def __init__(self, containertype=None, error=None, jobs=None, life=None):
+class CloudSpecResults(Type):
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
+    def __init__(self, results=None):
         '''
-        containertype : str
-        error : Error
-        jobs : typing.Sequence[str]
-        life : str
+        results : typing.Sequence<+T_co>[~CloudSpecResult]<~CloudSpecResult>
         '''
-        self.containertype = containertype
-        self.error = Error.from_json(error) if error else None
-        self.jobs = jobs
-        self.life = life
+        self.results = [CloudSpecResult.from_json(o) for o in results or []]
 
 
-class AgentGetEntitiesResults(Type):
-    _toSchema = {'entities': 'Entities'}
-    _toPy = {'Entities': 'entities'}
-    def __init__(self, entities=None):
+class ControllerConfigResult(Type):
+    _toSchema = {'config': 'config'}
+    _toPy = {'config': 'config'}
+    def __init__(self, config=None):
         '''
-        entities : typing.Sequence[~AgentGetEntitiesResult]
+        config : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         '''
-        self.entities = [AgentGetEntitiesResult.from_json(o) for o in entities or []]
+        self.config = config
 
 
 class EntityPassword(Type):
-    _toSchema = {'password': 'Password', 'tag': 'Tag'}
-    _toPy = {'Tag': 'tag', 'Password': 'password'}
+    _toSchema = {'password': 'password', 'tag': 'tag'}
+    _toPy = {'password': 'password', 'tag': 'tag'}
     def __init__(self, password=None, tag=None):
         '''
         password : str
@@ -367,28 +359,38 @@ class EntityPassword(Type):
 
 
 class EntityPasswords(Type):
-    _toSchema = {'changes': 'Changes'}
-    _toPy = {'Changes': 'changes'}
+    _toSchema = {'changes': 'changes'}
+    _toPy = {'changes': 'changes'}
     def __init__(self, changes=None):
         '''
-        changes : typing.Sequence[~EntityPassword]
+        changes : typing.Sequence<+T_co>[~EntityPassword]<~EntityPassword>
         '''
         self.changes = [EntityPassword.from_json(o) for o in changes or []]
 
 
+class ErrorResult(Type):
+    _toSchema = {'error': 'error'}
+    _toPy = {'error': 'error'}
+    def __init__(self, error=None):
+        '''
+        error : Error
+        '''
+        self.error = Error.from_json(error) if error else None
+
+
 class ErrorResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ErrorResult]
+        results : typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         self.results = [ErrorResult.from_json(o) for o in results or []]
 
 
 class IsMasterResult(Type):
-    _toSchema = {'master': 'Master'}
-    _toPy = {'Master': 'master'}
+    _toSchema = {'master': 'master'}
+    _toPy = {'master': 'master'}
     def __init__(self, master=None):
         '''
         master : bool
@@ -397,65 +399,85 @@ class IsMasterResult(Type):
 
 
 class ModelConfigResult(Type):
-    _toSchema = {'config': 'Config'}
-    _toPy = {'Config': 'config'}
+    _toSchema = {'config': 'config'}
+    _toPy = {'config': 'config'}
     def __init__(self, config=None):
         '''
-        config : typing.Mapping[str, typing.Any]
+        config : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         '''
         self.config = config
 
 
+class ModelTag(Type):
+    _toSchema = {}
+    _toPy = {}
+    def __init__(self):
+        '''
+
+        '''
+        pass
+
+
 class NotifyWatchResult(Type):
-    _toSchema = {'notifywatcherid': 'NotifyWatcherId', 'error': 'Error'}
-    _toPy = {'NotifyWatcherId': 'notifywatcherid', 'Error': 'error'}
-    def __init__(self, error=None, notifywatcherid=None):
+    _toSchema = {'error': 'error', 'notifywatcherid': 'NotifyWatcherId'}
+    _toPy = {'NotifyWatcherId': 'notifywatcherid', 'error': 'error'}
+    def __init__(self, notifywatcherid=None, error=None):
         '''
-        error : Error
         notifywatcherid : str
+        error : Error
         '''
-        self.error = Error.from_json(error) if error else None
         self.notifywatcherid = notifywatcherid
+        self.error = Error.from_json(error) if error else None
+
+
+class NotifyWatchResults(Type):
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
+    def __init__(self, results=None):
+        '''
+        results : typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
+        '''
+        self.results = [NotifyWatchResult.from_json(o) for o in results or []]
 
 
 class StateServingInfo(Type):
-    _toSchema = {'apiport': 'APIPort', 'stateport': 'StatePort', 'cert': 'Cert', 'caprivatekey': 'CAPrivateKey', 'systemidentity': 'SystemIdentity', 'sharedsecret': 'SharedSecret', 'privatekey': 'PrivateKey'}
-    _toPy = {'SharedSecret': 'sharedsecret', 'CAPrivateKey': 'caprivatekey', 'Cert': 'cert', 'PrivateKey': 'privatekey', 'StatePort': 'stateport', 'SystemIdentity': 'systemidentity', 'APIPort': 'apiport'}
-    def __init__(self, apiport=None, caprivatekey=None, cert=None, privatekey=None, sharedsecret=None, stateport=None, systemidentity=None):
+    _toSchema = {'api_port': 'api-port', 'ca_private_key': 'ca-private-key', 'cert': 'cert', 'private_key': 'private-key', 'shared_secret': 'shared-secret', 'state_port': 'state-port', 'system_identity': 'system-identity'}
+    _toPy = {'api-port': 'api_port', 'ca-private-key': 'ca_private_key', 'cert': 'cert', 'private-key': 'private_key', 'shared-secret': 'shared_secret', 'state-port': 'state_port', 'system-identity': 'system_identity'}
+    def __init__(self, api_port=None, ca_private_key=None, cert=None, private_key=None, shared_secret=None, state_port=None, system_identity=None):
         '''
-        apiport : int
-        caprivatekey : str
+        api_port : int
+        ca_private_key : str
         cert : str
-        privatekey : str
-        sharedsecret : str
-        stateport : int
-        systemidentity : str
+        private_key : str
+        shared_secret : str
+        state_port : int
+        system_identity : str
         '''
-        self.apiport = apiport
-        self.caprivatekey = caprivatekey
+        self.api_port = api_port
+        self.ca_private_key = ca_private_key
         self.cert = cert
-        self.privatekey = privatekey
-        self.sharedsecret = sharedsecret
-        self.stateport = stateport
-        self.systemidentity = systemidentity
+        self.private_key = private_key
+        self.shared_secret = shared_secret
+        self.state_port = state_port
+        self.system_identity = system_identity
 
 
 class AllWatcherNextResults(Type):
-    _toSchema = {'deltas': 'Deltas'}
-    _toPy = {'Deltas': 'deltas'}
+    _toSchema = {'deltas': 'deltas'}
+    _toPy = {'deltas': 'deltas'}
     def __init__(self, deltas=None):
         '''
-        deltas : typing.Sequence[~Delta]
+        deltas : typing.Sequence<+T_co>[~Delta]<~Delta>
         '''
         self.deltas = [Delta.from_json(o) for o in deltas or []]
 
 
 class Delta(Type):
-    _toSchema = {'entity': 'Entity', 'removed': 'Removed'}
-    _toPy = {'Removed': 'removed', 'Entity': 'entity'}
+    _toSchema = {'entity': 'entity', 'removed': 'removed'}
+    _toPy = {'entity': 'entity', 'removed': 'removed'}
     def __init__(self, entity=None, removed=None):
         '''
-        entity : typing.Mapping[str, typing.Any]
+        entity : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         removed : bool
         '''
         self.entity = entity
@@ -463,305 +485,333 @@ class Delta(Type):
 
 
 class AnnotationsGetResult(Type):
-    _toSchema = {'entitytag': 'EntityTag', 'annotations': 'Annotations', 'error': 'Error'}
-    _toPy = {'Error': 'error', 'Annotations': 'annotations', 'EntityTag': 'entitytag'}
-    def __init__(self, annotations=None, entitytag=None, error=None):
+    _toSchema = {'annotations': 'annotations', 'entity': 'entity', 'error': 'error'}
+    _toPy = {'annotations': 'annotations', 'entity': 'entity', 'error': 'error'}
+    def __init__(self, annotations=None, entity=None, error=None):
         '''
-        annotations : typing.Mapping[str, str]
-        entitytag : str
+        annotations : typing.Mapping<~KT, +VT_co>[str, str]
+        entity : str
         error : ErrorResult
         '''
         self.annotations = annotations
-        self.entitytag = entitytag
+        self.entity = entity
         self.error = ErrorResult.from_json(error) if error else None
 
 
 class AnnotationsGetResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~AnnotationsGetResult]
+        results : typing.Sequence<+T_co>[~AnnotationsGetResult]<~AnnotationsGetResult>
         '''
         self.results = [AnnotationsGetResult.from_json(o) for o in results or []]
 
 
 class AnnotationsSet(Type):
-    _toSchema = {'annotations': 'Annotations'}
-    _toPy = {'Annotations': 'annotations'}
+    _toSchema = {'annotations': 'annotations'}
+    _toPy = {'annotations': 'annotations'}
     def __init__(self, annotations=None):
         '''
-        annotations : typing.Sequence[~EntityAnnotations]
+        annotations : typing.Sequence<+T_co>[~EntityAnnotations]<~EntityAnnotations>
         '''
         self.annotations = [EntityAnnotations.from_json(o) for o in annotations or []]
 
 
 class EntityAnnotations(Type):
-    _toSchema = {'entitytag': 'EntityTag', 'annotations': 'Annotations'}
-    _toPy = {'Annotations': 'annotations', 'EntityTag': 'entitytag'}
-    def __init__(self, annotations=None, entitytag=None):
+    _toSchema = {'annotations': 'annotations', 'entity': 'entity'}
+    _toPy = {'annotations': 'annotations', 'entity': 'entity'}
+    def __init__(self, annotations=None, entity=None):
         '''
-        annotations : typing.Mapping[str, str]
-        entitytag : str
+        annotations : typing.Mapping<~KT, +VT_co>[str, str]
+        entity : str
         '''
         self.annotations = annotations
-        self.entitytag = entitytag
+        self.entity = entity
 
 
 class AddApplicationUnits(Type):
-    _toSchema = {'numunits': 'NumUnits', 'applicationname': 'ApplicationName', 'placement': 'Placement'}
-    _toPy = {'NumUnits': 'numunits', 'Placement': 'placement', 'ApplicationName': 'applicationname'}
-    def __init__(self, applicationname=None, numunits=None, placement=None):
+    _toSchema = {'application': 'application', 'num_units': 'num-units', 'placement': 'placement'}
+    _toPy = {'application': 'application', 'num-units': 'num_units', 'placement': 'placement'}
+    def __init__(self, application=None, num_units=None, placement=None):
         '''
-        applicationname : str
-        numunits : int
-        placement : typing.Sequence[~Placement]
+        application : str
+        num_units : int
+        placement : typing.Sequence<+T_co>[~Placement]<~Placement>
         '''
-        self.applicationname = applicationname
-        self.numunits = numunits
+        self.application = application
+        self.num_units = num_units
         self.placement = [Placement.from_json(o) for o in placement or []]
 
 
 class AddApplicationUnitsResults(Type):
-    _toSchema = {'units': 'Units'}
-    _toPy = {'Units': 'units'}
+    _toSchema = {'units': 'units'}
+    _toPy = {'units': 'units'}
     def __init__(self, units=None):
         '''
-        units : typing.Sequence[str]
+        units : typing.Sequence<+T_co>[str]
         '''
         self.units = units
 
 
 class AddRelation(Type):
-    _toSchema = {'endpoints': 'Endpoints'}
-    _toPy = {'Endpoints': 'endpoints'}
+    _toSchema = {'endpoints': 'endpoints'}
+    _toPy = {'endpoints': 'endpoints'}
     def __init__(self, endpoints=None):
         '''
-        endpoints : typing.Sequence[str]
+        endpoints : typing.Sequence<+T_co>[str]
         '''
         self.endpoints = endpoints
 
 
 class AddRelationResults(Type):
-    _toSchema = {'endpoints': 'Endpoints'}
-    _toPy = {'Endpoints': 'endpoints'}
+    _toSchema = {'endpoints': 'endpoints'}
+    _toPy = {'endpoints': 'endpoints'}
     def __init__(self, endpoints=None):
         '''
-        endpoints : typing.Mapping[str, ~Relation]
+        endpoints : typing.Mapping<~KT, +VT_co>[str, ~CharmRelation]<~CharmRelation>
         '''
-        self.endpoints = {k: Relation.from_json(v) for k, v in (endpoints or dict()).items()}
+        self.endpoints = endpoints
 
 
 class ApplicationCharmRelations(Type):
-    _toSchema = {'applicationname': 'ApplicationName'}
-    _toPy = {'ApplicationName': 'applicationname'}
-    def __init__(self, applicationname=None):
+    _toSchema = {'application': 'application'}
+    _toPy = {'application': 'application'}
+    def __init__(self, application=None):
         '''
-        applicationname : str
+        application : str
         '''
-        self.applicationname = applicationname
+        self.application = application
 
 
 class ApplicationCharmRelationsResults(Type):
-    _toSchema = {'charmrelations': 'CharmRelations'}
-    _toPy = {'CharmRelations': 'charmrelations'}
-    def __init__(self, charmrelations=None):
+    _toSchema = {'charm_relations': 'charm-relations'}
+    _toPy = {'charm-relations': 'charm_relations'}
+    def __init__(self, charm_relations=None):
         '''
-        charmrelations : typing.Sequence[str]
+        charm_relations : typing.Sequence<+T_co>[str]
         '''
-        self.charmrelations = charmrelations
+        self.charm_relations = charm_relations
 
 
 class ApplicationDeploy(Type):
-    _toSchema = {'resources': 'Resources', 'channel': 'Channel', 'numunits': 'NumUnits', 'charmurl': 'CharmUrl', 'endpointbindings': 'EndpointBindings', 'configyaml': 'ConfigYAML', 'series': 'Series', 'storage': 'Storage', 'placement': 'Placement', 'config': 'Config', 'constraints': 'Constraints', 'applicationname': 'ApplicationName'}
-    _toPy = {'Storage': 'storage', 'ApplicationName': 'applicationname', 'Channel': 'channel', 'CharmUrl': 'charmurl', 'Constraints': 'constraints', 'Config': 'config', 'ConfigYAML': 'configyaml', 'Resources': 'resources', 'EndpointBindings': 'endpointbindings', 'NumUnits': 'numunits', 'Placement': 'placement', 'Series': 'series'}
-    def __init__(self, applicationname=None, channel=None, charmurl=None, config=None, configyaml=None, constraints=None, endpointbindings=None, numunits=None, placement=None, resources=None, series=None, storage=None):
+    _toSchema = {'application': 'application', 'channel': 'channel', 'charm_url': 'charm-url', 'config': 'config', 'config_yaml': 'config-yaml', 'constraints': 'constraints', 'endpoint_bindings': 'endpoint-bindings', 'num_units': 'num-units', 'placement': 'placement', 'resources': 'resources', 'series': 'series', 'storage': 'storage'}
+    _toPy = {'application': 'application', 'channel': 'channel', 'charm-url': 'charm_url', 'config': 'config', 'config-yaml': 'config_yaml', 'constraints': 'constraints', 'endpoint-bindings': 'endpoint_bindings', 'num-units': 'num_units', 'placement': 'placement', 'resources': 'resources', 'series': 'series', 'storage': 'storage'}
+    def __init__(self, application=None, channel=None, charm_url=None, config=None, config_yaml=None, constraints=None, endpoint_bindings=None, num_units=None, placement=None, resources=None, series=None, storage=None):
         '''
-        applicationname : str
+        application : str
         channel : str
-        charmurl : str
-        config : typing.Mapping[str, str]
-        configyaml : str
+        charm_url : str
+        config : typing.Mapping<~KT, +VT_co>[str, str]
+        config_yaml : str
         constraints : Value
-        endpointbindings : typing.Mapping[str, str]
-        numunits : int
-        placement : typing.Sequence[~Placement]
-        resources : typing.Mapping[str, str]
+        endpoint_bindings : typing.Mapping<~KT, +VT_co>[str, str]
+        num_units : int
+        placement : typing.Sequence<+T_co>[~Placement]<~Placement>
+        resources : typing.Mapping<~KT, +VT_co>[str, str]
         series : str
-        storage : typing.Mapping[str, ~Constraints]
+        storage : typing.Mapping<~KT, +VT_co>[str, ~Constraints]<~Constraints>
         '''
-        self.applicationname = applicationname
+        self.application = application
         self.channel = channel
-        self.charmurl = charmurl
+        self.charm_url = charm_url
         self.config = config
-        self.configyaml = configyaml
+        self.config_yaml = config_yaml
         self.constraints = Value.from_json(constraints) if constraints else None
-        self.endpointbindings = endpointbindings
-        self.numunits = numunits
+        self.endpoint_bindings = endpoint_bindings
+        self.num_units = num_units
         self.placement = [Placement.from_json(o) for o in placement or []]
         self.resources = resources
         self.series = series
-        self.storage = {k: Constraints.from_json(v) for k, v in (storage or dict()).items()}
+        self.storage = storage
 
 
 class ApplicationDestroy(Type):
-    _toSchema = {'applicationname': 'ApplicationName'}
-    _toPy = {'ApplicationName': 'applicationname'}
-    def __init__(self, applicationname=None):
+    _toSchema = {'application': 'application'}
+    _toPy = {'application': 'application'}
+    def __init__(self, application=None):
         '''
-        applicationname : str
+        application : str
         '''
-        self.applicationname = applicationname
+        self.application = application
 
 
 class ApplicationExpose(Type):
-    _toSchema = {'applicationname': 'ApplicationName'}
-    _toPy = {'ApplicationName': 'applicationname'}
-    def __init__(self, applicationname=None):
+    _toSchema = {'application': 'application'}
+    _toPy = {'application': 'application'}
+    def __init__(self, application=None):
         '''
-        applicationname : str
+        application : str
         '''
-        self.applicationname = applicationname
+        self.application = application
 
 
 class ApplicationGet(Type):
-    _toSchema = {'applicationname': 'ApplicationName'}
-    _toPy = {'ApplicationName': 'applicationname'}
-    def __init__(self, applicationname=None):
+    _toSchema = {'application': 'application'}
+    _toPy = {'application': 'application'}
+    def __init__(self, application=None):
         '''
-        applicationname : str
+        application : str
         '''
-        self.applicationname = applicationname
+        self.application = application
 
 
 class ApplicationGetResults(Type):
-    _toSchema = {'charm': 'Charm', 'config': 'Config', 'application': 'Application', 'constraints': 'Constraints'}
-    _toPy = {'Constraints': 'constraints', 'Charm': 'charm', 'Application': 'application', 'Config': 'config'}
-    def __init__(self, application=None, charm=None, config=None, constraints=None):
+    _toSchema = {'application': 'application', 'charm': 'charm', 'config': 'config', 'constraints': 'constraints', 'series': 'series'}
+    _toPy = {'application': 'application', 'charm': 'charm', 'config': 'config', 'constraints': 'constraints', 'series': 'series'}
+    def __init__(self, application=None, charm=None, config=None, constraints=None, series=None):
         '''
         application : str
         charm : str
-        config : typing.Mapping[str, typing.Any]
+        config : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         constraints : Value
+        series : str
         '''
         self.application = application
         self.charm = charm
         self.config = config
         self.constraints = Value.from_json(constraints) if constraints else None
+        self.series = series
 
 
 class ApplicationMetricCredential(Type):
-    _toSchema = {'metriccredentials': 'MetricCredentials', 'applicationname': 'ApplicationName'}
-    _toPy = {'MetricCredentials': 'metriccredentials', 'ApplicationName': 'applicationname'}
-    def __init__(self, applicationname=None, metriccredentials=None):
+    _toSchema = {'application': 'application', 'metrics_credentials': 'metrics-credentials'}
+    _toPy = {'application': 'application', 'metrics-credentials': 'metrics_credentials'}
+    def __init__(self, application=None, metrics_credentials=None):
         '''
-        applicationname : str
-        metriccredentials : typing.Sequence[int]
+        application : str
+        metrics_credentials : typing.Sequence<+T_co>[int]
         '''
-        self.applicationname = applicationname
-        self.metriccredentials = metriccredentials
+        self.application = application
+        self.metrics_credentials = metrics_credentials
 
 
 class ApplicationMetricCredentials(Type):
-    _toSchema = {'creds': 'Creds'}
-    _toPy = {'Creds': 'creds'}
+    _toSchema = {'creds': 'creds'}
+    _toPy = {'creds': 'creds'}
     def __init__(self, creds=None):
         '''
-        creds : typing.Sequence[~ApplicationMetricCredential]
+        creds : typing.Sequence<+T_co>[~ApplicationMetricCredential]<~ApplicationMetricCredential>
         '''
         self.creds = [ApplicationMetricCredential.from_json(o) for o in creds or []]
 
 
 class ApplicationSet(Type):
-    _toSchema = {'options': 'Options', 'applicationname': 'ApplicationName'}
-    _toPy = {'Options': 'options', 'ApplicationName': 'applicationname'}
-    def __init__(self, applicationname=None, options=None):
+    _toSchema = {'application': 'application', 'options': 'options'}
+    _toPy = {'application': 'application', 'options': 'options'}
+    def __init__(self, application=None, options=None):
         '''
-        applicationname : str
-        options : typing.Mapping[str, str]
+        application : str
+        options : typing.Mapping<~KT, +VT_co>[str, str]
         '''
-        self.applicationname = applicationname
+        self.application = application
         self.options = options
 
 
 class ApplicationSetCharm(Type):
-    _toSchema = {'forceseries': 'forceseries', 'charmurl': 'charmurl', 'resourceids': 'resourceids', 'forceunits': 'forceunits', 'cs_channel': 'cs-channel', 'applicationname': 'applicationname'}
-    _toPy = {'forceseries': 'forceseries', 'charmurl': 'charmurl', 'forceunits': 'forceunits', 'cs-channel': 'cs_channel', 'applicationname': 'applicationname', 'resourceids': 'resourceids'}
-    def __init__(self, applicationname=None, charmurl=None, cs_channel=None, forceseries=None, forceunits=None, resourceids=None):
+    _toSchema = {'application': 'application', 'channel': 'channel', 'charm_url': 'charm-url', 'config_settings': 'config-settings', 'config_settings_yaml': 'config-settings-yaml', 'force_series': 'force-series', 'force_units': 'force-units', 'resource_ids': 'resource-ids', 'storage_constraints': 'storage-constraints'}
+    _toPy = {'application': 'application', 'channel': 'channel', 'charm-url': 'charm_url', 'config-settings': 'config_settings', 'config-settings-yaml': 'config_settings_yaml', 'force-series': 'force_series', 'force-units': 'force_units', 'resource-ids': 'resource_ids', 'storage-constraints': 'storage_constraints'}
+    def __init__(self, application=None, channel=None, charm_url=None, config_settings=None, config_settings_yaml=None, force_series=None, force_units=None, resource_ids=None, storage_constraints=None):
         '''
-        applicationname : str
-        charmurl : str
-        cs_channel : str
-        forceseries : bool
-        forceunits : bool
-        resourceids : typing.Mapping[str, str]
+        application : str
+        channel : str
+        charm_url : str
+        config_settings : typing.Mapping<~KT, +VT_co>[str, str]
+        config_settings_yaml : str
+        force_series : bool
+        force_units : bool
+        resource_ids : typing.Mapping<~KT, +VT_co>[str, str]
+        storage_constraints : typing.Mapping<~KT, +VT_co>[str, ~StorageConstraints]<~StorageConstraints>
         '''
-        self.applicationname = applicationname
-        self.charmurl = charmurl
-        self.cs_channel = cs_channel
-        self.forceseries = forceseries
-        self.forceunits = forceunits
-        self.resourceids = resourceids
+        self.application = application
+        self.channel = channel
+        self.charm_url = charm_url
+        self.config_settings = config_settings
+        self.config_settings_yaml = config_settings_yaml
+        self.force_series = force_series
+        self.force_units = force_units
+        self.resource_ids = resource_ids
+        self.storage_constraints = storage_constraints
 
 
 class ApplicationUnexpose(Type):
-    _toSchema = {'applicationname': 'ApplicationName'}
-    _toPy = {'ApplicationName': 'applicationname'}
-    def __init__(self, applicationname=None):
+    _toSchema = {'application': 'application'}
+    _toPy = {'application': 'application'}
+    def __init__(self, application=None):
         '''
-        applicationname : str
+        application : str
         '''
-        self.applicationname = applicationname
+        self.application = application
 
 
 class ApplicationUnset(Type):
-    _toSchema = {'options': 'Options', 'applicationname': 'ApplicationName'}
-    _toPy = {'Options': 'options', 'ApplicationName': 'applicationname'}
-    def __init__(self, applicationname=None, options=None):
+    _toSchema = {'application': 'application', 'options': 'options'}
+    _toPy = {'application': 'application', 'options': 'options'}
+    def __init__(self, application=None, options=None):
         '''
-        applicationname : str
-        options : typing.Sequence[str]
+        application : str
+        options : typing.Sequence<+T_co>[str]
         '''
-        self.applicationname = applicationname
+        self.application = application
         self.options = options
 
 
 class ApplicationUpdate(Type):
-    _toSchema = {'forceseries': 'ForceSeries', 'charmurl': 'CharmUrl', 'settingsyaml': 'SettingsYAML', 'constraints': 'Constraints', 'forcecharmurl': 'ForceCharmUrl', 'settingsstrings': 'SettingsStrings', 'applicationname': 'ApplicationName', 'minunits': 'MinUnits'}
-    _toPy = {'Constraints': 'constraints', 'SettingsYAML': 'settingsyaml', 'SettingsStrings': 'settingsstrings', 'ApplicationName': 'applicationname', 'MinUnits': 'minunits', 'ForceCharmUrl': 'forcecharmurl', 'CharmUrl': 'charmurl', 'ForceSeries': 'forceseries'}
-    def __init__(self, applicationname=None, charmurl=None, constraints=None, forcecharmurl=None, forceseries=None, minunits=None, settingsstrings=None, settingsyaml=None):
+    _toSchema = {'application': 'application', 'charm_url': 'charm-url', 'constraints': 'constraints', 'force_charm_url': 'force-charm-url', 'force_series': 'force-series', 'min_units': 'min-units', 'settings': 'settings', 'settings_yaml': 'settings-yaml'}
+    _toPy = {'application': 'application', 'charm-url': 'charm_url', 'constraints': 'constraints', 'force-charm-url': 'force_charm_url', 'force-series': 'force_series', 'min-units': 'min_units', 'settings': 'settings', 'settings-yaml': 'settings_yaml'}
+    def __init__(self, application=None, charm_url=None, constraints=None, force_charm_url=None, force_series=None, min_units=None, settings=None, settings_yaml=None):
         '''
-        applicationname : str
-        charmurl : str
+        application : str
+        charm_url : str
         constraints : Value
-        forcecharmurl : bool
-        forceseries : bool
-        minunits : int
-        settingsstrings : typing.Mapping[str, str]
-        settingsyaml : str
-        '''
-        self.applicationname = applicationname
-        self.charmurl = charmurl
+        force_charm_url : bool
+        force_series : bool
+        min_units : int
+        settings : typing.Mapping<~KT, +VT_co>[str, str]
+        settings_yaml : str
+        '''
+        self.application = application
+        self.charm_url = charm_url
         self.constraints = Value.from_json(constraints) if constraints else None
-        self.forcecharmurl = forcecharmurl
-        self.forceseries = forceseries
-        self.minunits = minunits
-        self.settingsstrings = settingsstrings
-        self.settingsyaml = settingsyaml
+        self.force_charm_url = force_charm_url
+        self.force_series = force_series
+        self.min_units = min_units
+        self.settings = settings
+        self.settings_yaml = settings_yaml
 
 
 class ApplicationsDeploy(Type):
-    _toSchema = {'applications': 'Applications'}
-    _toPy = {'Applications': 'applications'}
+    _toSchema = {'applications': 'applications'}
+    _toPy = {'applications': 'applications'}
     def __init__(self, applications=None):
         '''
-        applications : typing.Sequence[~ApplicationDeploy]
+        applications : typing.Sequence<+T_co>[~ApplicationDeploy]<~ApplicationDeploy>
         '''
         self.applications = [ApplicationDeploy.from_json(o) for o in applications or []]
 
 
+class CharmRelation(Type):
+    _toSchema = {'interface': 'interface', 'limit': 'limit', 'name': 'name', 'optional': 'optional', 'role': 'role', 'scope': 'scope'}
+    _toPy = {'interface': 'interface', 'limit': 'limit', 'name': 'name', 'optional': 'optional', 'role': 'role', 'scope': 'scope'}
+    def __init__(self, interface=None, limit=None, name=None, optional=None, role=None, scope=None):
+        '''
+        interface : str
+        limit : int
+        name : str
+        optional : bool
+        role : str
+        scope : str
+        '''
+        self.interface = interface
+        self.limit = limit
+        self.name = name
+        self.optional = optional
+        self.role = role
+        self.scope = scope
+
+
 class Constraints(Type):
-    _toSchema = {'pool': 'Pool', 'size': 'Size', 'count': 'Count'}
+    _toSchema = {'count': 'Count', 'pool': 'Pool', 'size': 'Size'}
     _toPy = {'Count': 'count', 'Pool': 'pool', 'Size': 'size'}
     def __init__(self, count=None, pool=None, size=None):
         '''
@@ -775,66 +825,48 @@ class Constraints(Type):
 
 
 class DestroyApplicationUnits(Type):
-    _toSchema = {'unitnames': 'UnitNames'}
-    _toPy = {'UnitNames': 'unitnames'}
-    def __init__(self, unitnames=None):
+    _toSchema = {'unit_names': 'unit-names'}
+    _toPy = {'unit-names': 'unit_names'}
+    def __init__(self, unit_names=None):
         '''
-        unitnames : typing.Sequence[str]
+        unit_names : typing.Sequence<+T_co>[str]
         '''
-        self.unitnames = unitnames
+        self.unit_names = unit_names
 
 
 class DestroyRelation(Type):
-    _toSchema = {'endpoints': 'Endpoints'}
-    _toPy = {'Endpoints': 'endpoints'}
+    _toSchema = {'endpoints': 'endpoints'}
+    _toPy = {'endpoints': 'endpoints'}
     def __init__(self, endpoints=None):
         '''
-        endpoints : typing.Sequence[str]
+        endpoints : typing.Sequence<+T_co>[str]
         '''
         self.endpoints = endpoints
 
 
 class GetApplicationConstraints(Type):
-    _toSchema = {'applicationname': 'ApplicationName'}
-    _toPy = {'ApplicationName': 'applicationname'}
-    def __init__(self, applicationname=None):
+    _toSchema = {'application': 'application'}
+    _toPy = {'application': 'application'}
+    def __init__(self, application=None):
         '''
-        applicationname : str
+        application : str
         '''
-        self.applicationname = applicationname
+        self.application = application
 
 
 class GetConstraintsResults(Type):
-    _toSchema = {'root_disk': 'root-disk', 'mem': 'mem', 'container': 'container', 'virt_type': 'virt-type', 'cpu_power': 'cpu-power', 'cpu_cores': 'cpu-cores', 'tags': 'tags', 'arch': 'arch', 'spaces': 'spaces', 'instance_type': 'instance-type'}
-    _toPy = {'spaces': 'spaces', 'container': 'container', 'cpu-cores': 'cpu_cores', 'instance-type': 'instance_type', 'mem': 'mem', 'cpu-power': 'cpu_power', 'tags': 'tags', 'arch': 'arch', 'root-disk': 'root_disk', 'virt-type': 'virt_type'}
-    def __init__(self, arch=None, container=None, cpu_cores=None, cpu_power=None, instance_type=None, mem=None, root_disk=None, spaces=None, tags=None, virt_type=None):
+    _toSchema = {'constraints': 'constraints'}
+    _toPy = {'constraints': 'constraints'}
+    def __init__(self, constraints=None):
         '''
-        arch : str
-        container : str
-        cpu_cores : int
-        cpu_power : int
-        instance_type : str
-        mem : int
-        root_disk : int
-        spaces : typing.Sequence[str]
-        tags : typing.Sequence[str]
-        virt_type : str
+        constraints : Value
         '''
-        self.arch = arch
-        self.container = container
-        self.cpu_cores = cpu_cores
-        self.cpu_power = cpu_power
-        self.instance_type = instance_type
-        self.mem = mem
-        self.root_disk = root_disk
-        self.spaces = spaces
-        self.tags = tags
-        self.virt_type = virt_type
+        self.constraints = Value.from_json(constraints) if constraints else None
 
 
 class Placement(Type):
-    _toSchema = {'directive': 'Directive', 'scope': 'Scope'}
-    _toPy = {'Directive': 'directive', 'Scope': 'scope'}
+    _toSchema = {'directive': 'directive', 'scope': 'scope'}
+    _toPy = {'directive': 'directive', 'scope': 'scope'}
     def __init__(self, directive=None, scope=None):
         '''
         directive : str
@@ -844,41 +876,35 @@ class Placement(Type):
         self.scope = scope
 
 
-class Relation(Type):
-    _toSchema = {'role': 'Role', 'limit': 'Limit', 'optional': 'Optional', 'name': 'Name', 'scope': 'Scope', 'interface': 'Interface'}
-    _toPy = {'Name': 'name', 'Role': 'role', 'Scope': 'scope', 'Limit': 'limit', 'Interface': 'interface', 'Optional': 'optional'}
-    def __init__(self, interface=None, limit=None, name=None, optional=None, role=None, scope=None):
+class SetConstraints(Type):
+    _toSchema = {'application': 'application', 'constraints': 'constraints'}
+    _toPy = {'application': 'application', 'constraints': 'constraints'}
+    def __init__(self, application=None, constraints=None):
         '''
-        interface : str
-        limit : int
-        name : str
-        optional : bool
-        role : str
-        scope : str
+        application : str
+        constraints : Value
         '''
-        self.interface = interface
-        self.limit = limit
-        self.name = name
-        self.optional = optional
-        self.role = role
-        self.scope = scope
+        self.application = application
+        self.constraints = Value.from_json(constraints) if constraints else None
 
 
-class SetConstraints(Type):
-    _toSchema = {'constraints': 'Constraints', 'applicationname': 'ApplicationName'}
-    _toPy = {'Constraints': 'constraints', 'ApplicationName': 'applicationname'}
-    def __init__(self, applicationname=None, constraints=None):
+class StorageConstraints(Type):
+    _toSchema = {'count': 'count', 'pool': 'pool', 'size': 'size'}
+    _toPy = {'count': 'count', 'pool': 'pool', 'size': 'size'}
+    def __init__(self, count=None, pool=None, size=None):
         '''
-        applicationname : str
-        constraints : Value
+        count : int
+        pool : str
+        size : int
         '''
-        self.applicationname = applicationname
-        self.constraints = Value.from_json(constraints) if constraints else None
+        self.count = count
+        self.pool = pool
+        self.size = size
 
 
 class StringResult(Type):
-    _toSchema = {'result': 'Result', 'error': 'Error'}
-    _toPy = {'Result': 'result', 'Error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -889,24 +915,24 @@ class StringResult(Type):
 
 
 class Value(Type):
-    _toSchema = {'root_disk': 'root-disk', 'mem': 'mem', 'container': 'container', 'virt_type': 'virt-type', 'cpu_power': 'cpu-power', 'cpu_cores': 'cpu-cores', 'tags': 'tags', 'arch': 'arch', 'spaces': 'spaces', 'instance_type': 'instance-type'}
-    _toPy = {'spaces': 'spaces', 'container': 'container', 'cpu-cores': 'cpu_cores', 'instance-type': 'instance_type', 'mem': 'mem', 'cpu-power': 'cpu_power', 'tags': 'tags', 'arch': 'arch', 'root-disk': 'root_disk', 'virt-type': 'virt_type'}
-    def __init__(self, arch=None, container=None, cpu_cores=None, cpu_power=None, instance_type=None, mem=None, root_disk=None, spaces=None, tags=None, virt_type=None):
+    _toSchema = {'arch': 'arch', 'container': 'container', 'cores': 'cores', 'cpu_power': 'cpu-power', 'instance_type': 'instance-type', 'mem': 'mem', 'root_disk': 'root-disk', 'spaces': 'spaces', 'tags': 'tags', 'virt_type': 'virt-type'}
+    _toPy = {'arch': 'arch', 'container': 'container', 'cores': 'cores', 'cpu-power': 'cpu_power', 'instance-type': 'instance_type', 'mem': 'mem', 'root-disk': 'root_disk', 'spaces': 'spaces', 'tags': 'tags', 'virt-type': 'virt_type'}
+    def __init__(self, arch=None, container=None, cores=None, cpu_power=None, instance_type=None, mem=None, root_disk=None, spaces=None, tags=None, virt_type=None):
         '''
         arch : str
         container : str
-        cpu_cores : int
+        cores : int
         cpu_power : int
         instance_type : str
         mem : int
         root_disk : int
-        spaces : typing.Sequence[str]
-        tags : typing.Sequence[str]
+        spaces : typing.Sequence<+T_co>[str]
+        tags : typing.Sequence<+T_co>[str]
         virt_type : str
         '''
         self.arch = arch
         self.container = container
-        self.cpu_cores = cpu_cores
+        self.cores = cores
         self.cpu_power = cpu_power
         self.instance_type = instance_type
         self.mem = mem
@@ -916,23 +942,75 @@ class Value(Type):
         self.virt_type = virt_type
 
 
+class ApplicationRelationsChange(Type):
+    _toSchema = {'changed': 'changed', 'removed': 'removed'}
+    _toPy = {'changed': 'changed', 'removed': 'removed'}
+    def __init__(self, changed=None, removed=None):
+        '''
+        changed : typing.Sequence<+T_co>[~RelationChange]<~RelationChange>
+        removed : typing.Sequence<+T_co>[int]
+        '''
+        self.changed = [RelationChange.from_json(o) for o in changed or []]
+        self.removed = removed
+
+
+class ApplicationRelationsWatchResult(Type):
+    _toSchema = {'applicationrelationswatcherid': 'ApplicationRelationsWatcherId', 'changes': 'changes', 'error': 'error'}
+    _toPy = {'ApplicationRelationsWatcherId': 'applicationrelationswatcherid', 'changes': 'changes', 'error': 'error'}
+    def __init__(self, applicationrelationswatcherid=None, changes=None, error=None):
+        '''
+        applicationrelationswatcherid : str
+        changes : ApplicationRelationsChange
+        error : Error
+        '''
+        self.applicationrelationswatcherid = applicationrelationswatcherid
+        self.changes = ApplicationRelationsChange.from_json(changes) if changes else None
+        self.error = Error.from_json(error) if error else None
+
+
+class RelationChange(Type):
+    _toSchema = {'changedunits': 'changedunits', 'departedunits': 'departedunits', 'id_': 'id', 'life': 'life'}
+    _toPy = {'changedunits': 'changedunits', 'departedunits': 'departedunits', 'id': 'id_', 'life': 'life'}
+    def __init__(self, changedunits=None, departedunits=None, id_=None, life=None):
+        '''
+        changedunits : typing.Mapping<~KT, +VT_co>[str, ~RelationUnitChange]<~RelationUnitChange>
+        departedunits : typing.Sequence<+T_co>[str]
+        id_ : int
+        life : str
+        '''
+        self.changedunits = changedunits
+        self.departedunits = departedunits
+        self.id_ = id_
+        self.life = life
+
+
+class RelationUnitChange(Type):
+    _toSchema = {'settings': 'settings'}
+    _toPy = {'settings': 'settings'}
+    def __init__(self, settings=None):
+        '''
+        settings : typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        '''
+        self.settings = settings
+
+
 class StringsWatchResult(Type):
-    _toSchema = {'changes': 'Changes', 'stringswatcherid': 'StringsWatcherId', 'error': 'Error'}
-    _toPy = {'Changes': 'changes', 'Error': 'error', 'StringsWatcherId': 'stringswatcherid'}
-    def __init__(self, changes=None, error=None, stringswatcherid=None):
+    _toSchema = {'changes': 'changes', 'error': 'error', 'watcher_id': 'watcher-id'}
+    _toPy = {'changes': 'changes', 'error': 'error', 'watcher-id': 'watcher_id'}
+    def __init__(self, changes=None, error=None, watcher_id=None):
         '''
-        changes : typing.Sequence[str]
+        changes : typing.Sequence<+T_co>[str]
         error : Error
-        stringswatcherid : str
+        watcher_id : str
         '''
         self.changes = changes
         self.error = Error.from_json(error) if error else None
-        self.stringswatcherid = stringswatcherid
+        self.watcher_id = watcher_id
 
 
 class BackupsCreateArgs(Type):
-    _toSchema = {'notes': 'Notes'}
-    _toPy = {'Notes': 'notes'}
+    _toSchema = {'notes': 'notes'}
+    _toPy = {'notes': 'notes'}
     def __init__(self, notes=None):
         '''
         notes : str
@@ -941,8 +1019,8 @@ class BackupsCreateArgs(Type):
 
 
 class BackupsInfoArgs(Type):
-    _toSchema = {'id_': 'ID'}
-    _toPy = {'ID': 'id_'}
+    _toSchema = {'id_': 'id'}
+    _toPy = {'id': 'id_'}
     def __init__(self, id_=None):
         '''
         id_ : str
@@ -961,24 +1039,24 @@ class BackupsListArgs(Type):
 
 
 class BackupsListResult(Type):
-    _toSchema = {'list_': 'List'}
-    _toPy = {'List': 'list_'}
+    _toSchema = {'list_': 'list'}
+    _toPy = {'list': 'list_'}
     def __init__(self, list_=None):
         '''
-        list_ : typing.Sequence[~BackupsMetadataResult]
+        list_ : typing.Sequence<+T_co>[~BackupsMetadataResult]<~BackupsMetadataResult>
         '''
         self.list_ = [BackupsMetadataResult.from_json(o) for o in list_ or []]
 
 
 class BackupsMetadataResult(Type):
-    _toSchema = {'checksumformat': 'ChecksumFormat', 'started': 'Started', 'stored': 'Stored', 'cacert': 'CACert', 'version': 'Version', 'machine': 'Machine', 'checksum': 'Checksum', 'series': 'Series', 'id_': 'ID', 'hostname': 'Hostname', 'size': 'Size', 'finished': 'Finished', 'caprivatekey': 'CAPrivateKey', 'model': 'Model', 'notes': 'Notes'}
-    _toPy = {'Finished': 'finished', 'ChecksumFormat': 'checksumformat', 'CAPrivateKey': 'caprivatekey', 'Started': 'started', 'ID': 'id_', 'Notes': 'notes', 'Stored': 'stored', 'Hostname': 'hostname', 'Model': 'model', 'Size': 'size', 'Checksum': 'checksum', 'Machine': 'machine', 'Version': 'version', 'CACert': 'cacert', 'Series': 'series'}
-    def __init__(self, cacert=None, caprivatekey=None, checksum=None, checksumformat=None, finished=None, hostname=None, id_=None, machine=None, model=None, notes=None, series=None, size=None, started=None, stored=None, version=None):
+    _toSchema = {'ca_cert': 'ca-cert', 'ca_private_key': 'ca-private-key', 'checksum': 'checksum', 'checksum_format': 'checksum-format', 'finished': 'finished', 'hostname': 'hostname', 'id_': 'id', 'machine': 'machine', 'model': 'model', 'notes': 'notes', 'series': 'series', 'size': 'size', 'started': 'started', 'stored': 'stored', 'version': 'version'}
+    _toPy = {'ca-cert': 'ca_cert', 'ca-private-key': 'ca_private_key', 'checksum': 'checksum', 'checksum-format': 'checksum_format', 'finished': 'finished', 'hostname': 'hostname', 'id': 'id_', 'machine': 'machine', 'model': 'model', 'notes': 'notes', 'series': 'series', 'size': 'size', 'started': 'started', 'stored': 'stored', 'version': 'version'}
+    def __init__(self, ca_cert=None, ca_private_key=None, checksum=None, checksum_format=None, finished=None, hostname=None, id_=None, machine=None, model=None, notes=None, series=None, size=None, started=None, stored=None, version=None):
         '''
-        cacert : str
-        caprivatekey : str
+        ca_cert : str
+        ca_private_key : str
         checksum : str
-        checksumformat : str
+        checksum_format : str
         finished : str
         hostname : str
         id_ : str
@@ -991,10 +1069,10 @@ class BackupsMetadataResult(Type):
         stored : str
         version : Number
         '''
-        self.cacert = cacert
-        self.caprivatekey = caprivatekey
+        self.ca_cert = ca_cert
+        self.ca_private_key = ca_private_key
         self.checksum = checksum
-        self.checksumformat = checksumformat
+        self.checksum_format = checksum_format
         self.finished = finished
         self.hostname = hostname
         self.id_ = id_
@@ -1009,8 +1087,8 @@ class BackupsMetadataResult(Type):
 
 
 class BackupsRemoveArgs(Type):
-    _toSchema = {'id_': 'ID'}
-    _toPy = {'ID': 'id_'}
+    _toSchema = {'id_': 'id'}
+    _toPy = {'id': 'id_'}
     def __init__(self, id_=None):
         '''
         id_ : str
@@ -1019,8 +1097,8 @@ class BackupsRemoveArgs(Type):
 
 
 class Number(Type):
-    _toSchema = {'minor': 'Minor', 'major': 'Major', 'patch': 'Patch', 'tag': 'Tag', 'build': 'Build'}
-    _toPy = {'Patch': 'patch', 'Major': 'major', 'Minor': 'minor', 'Tag': 'tag', 'Build': 'build'}
+    _toSchema = {'build': 'Build', 'major': 'Major', 'minor': 'Minor', 'patch': 'Patch', 'tag': 'Tag'}
+    _toPy = {'Build': 'build', 'Major': 'major', 'Minor': 'minor', 'Patch': 'patch', 'Tag': 'tag'}
     def __init__(self, build=None, major=None, minor=None, patch=None, tag=None):
         '''
         build : int
@@ -1037,18 +1115,18 @@ class Number(Type):
 
 
 class RestoreArgs(Type):
-    _toSchema = {'backupid': 'BackupId'}
-    _toPy = {'BackupId': 'backupid'}
-    def __init__(self, backupid=None):
+    _toSchema = {'backup_id': 'backup-id'}
+    _toPy = {'backup-id': 'backup_id'}
+    def __init__(self, backup_id=None):
         '''
-        backupid : str
+        backup_id : str
         '''
-        self.backupid = backupid
+        self.backup_id = backup_id
 
 
 class Block(Type):
-    _toSchema = {'type_': 'type', 'id_': 'id', 'message': 'message', 'tag': 'tag'}
-    _toPy = {'type': 'type_', 'id': 'id_', 'message': 'message', 'tag': 'tag'}
+    _toSchema = {'id_': 'id', 'message': 'message', 'tag': 'tag', 'type_': 'type'}
+    _toPy = {'id': 'id_', 'message': 'message', 'tag': 'tag', 'type': 'type_'}
     def __init__(self, id_=None, message=None, tag=None, type_=None):
         '''
         id_ : str
@@ -1063,8 +1141,8 @@ class Block(Type):
 
 
 class BlockResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -1079,14 +1157,14 @@ class BlockResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~BlockResult]
+        results : typing.Sequence<+T_co>[~BlockResult]<~BlockResult>
         '''
         self.results = [BlockResult.from_json(o) for o in results or []]
 
 
 class BlockSwitchParams(Type):
-    _toSchema = {'type_': 'type', 'message': 'message'}
-    _toPy = {'type': 'type_', 'message': 'message'}
+    _toSchema = {'message': 'message', 'type_': 'type'}
+    _toPy = {'message': 'message', 'type': 'type_'}
     def __init__(self, message=None, type_=None):
         '''
         message : str
@@ -1096,59 +1174,283 @@ class BlockSwitchParams(Type):
         self.type_ = type_
 
 
-class CharmInfo(Type):
-    _toSchema = {'charmurl': 'CharmURL'}
-    _toPy = {'CharmURL': 'charmurl'}
-    def __init__(self, charmurl=None):
+class BundleChange(Type):
+    _toSchema = {'args': 'args', 'id_': 'id', 'method': 'method', 'requires': 'requires'}
+    _toPy = {'args': 'args', 'id': 'id_', 'method': 'method', 'requires': 'requires'}
+    def __init__(self, args=None, id_=None, method=None, requires=None):
         '''
-        charmurl : str
+        args : typing.Sequence<+T_co>[typing.Any]
+        id_ : str
+        method : str
+        requires : typing.Sequence<+T_co>[str]
         '''
-        self.charmurl = charmurl
+        self.args = args
+        self.id_ = id_
+        self.method = method
+        self.requires = requires
 
 
-class CharmsList(Type):
-    _toSchema = {'names': 'Names'}
-    _toPy = {'Names': 'names'}
-    def __init__(self, names=None):
+class BundleChangesParams(Type):
+    _toSchema = {'yaml': 'yaml'}
+    _toPy = {'yaml': 'yaml'}
+    def __init__(self, yaml=None):
         '''
-        names : typing.Sequence[str]
+        yaml : str
         '''
-        self.names = names
+        self.yaml = yaml
 
 
-class CharmsListResult(Type):
-    _toSchema = {'charmurls': 'CharmURLs'}
-    _toPy = {'CharmURLs': 'charmurls'}
-    def __init__(self, charmurls=None):
+class BundleChangesResults(Type):
+    _toSchema = {'changes': 'changes', 'errors': 'errors'}
+    _toPy = {'changes': 'changes', 'errors': 'errors'}
+    def __init__(self, changes=None, errors=None):
         '''
-        charmurls : typing.Sequence[str]
+        changes : typing.Sequence<+T_co>[~BundleChange]<~BundleChange>
+        errors : typing.Sequence<+T_co>[str]
         '''
-        self.charmurls = charmurls
+        self.changes = [BundleChange.from_json(o) for o in changes or []]
+        self.errors = errors
 
 
-class IsMeteredResult(Type):
-    _toSchema = {'metered': 'Metered'}
-    _toPy = {'Metered': 'metered'}
-    def __init__(self, metered=None):
+class CharmActionSpec(Type):
+    _toSchema = {'description': 'description', 'params': 'params'}
+    _toPy = {'description': 'description', 'params': 'params'}
+    def __init__(self, description=None, params=None):
         '''
-        metered : bool
+        description : str
+        params : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         '''
-        self.metered = metered
+        self.description = description
+        self.params = params
 
 
-class APIHostPortsResult(Type):
-    _toSchema = {'servers': 'Servers'}
-    _toPy = {'Servers': 'servers'}
-    def __init__(self, servers=None):
-        '''
-        servers : typing.Sequence[~HostPort]
+class CharmActions(Type):
+    _toSchema = {'specs': 'specs'}
+    _toPy = {'specs': 'specs'}
+    def __init__(self, specs=None):
+        '''
+        specs : typing.Mapping<~KT, +VT_co>[str, ~CharmActionSpec]<~CharmActionSpec>
+        '''
+        self.specs = specs
+
+
+class CharmInfo(Type):
+    _toSchema = {'actions': 'actions', 'config': 'config', 'meta': 'meta', 'metrics': 'metrics', 'revision': 'revision', 'url': 'url'}
+    _toPy = {'actions': 'actions', 'config': 'config', 'meta': 'meta', 'metrics': 'metrics', 'revision': 'revision', 'url': 'url'}
+    def __init__(self, actions=None, config=None, meta=None, metrics=None, revision=None, url=None):
+        '''
+        actions : CharmActions
+        config : typing.Mapping<~KT, +VT_co>[str, ~CharmOption]<~CharmOption>
+        meta : CharmMeta
+        metrics : CharmMetrics
+        revision : int
+        url : str
+        '''
+        self.actions = CharmActions.from_json(actions) if actions else None
+        self.config = config
+        self.meta = CharmMeta.from_json(meta) if meta else None
+        self.metrics = CharmMetrics.from_json(metrics) if metrics else None
+        self.revision = revision
+        self.url = url
+
+
+class CharmMeta(Type):
+    _toSchema = {'categories': 'categories', 'description': 'description', 'extra_bindings': 'extra-bindings', 'min_juju_version': 'min-juju-version', 'name': 'name', 'payload_classes': 'payload-classes', 'peers': 'peers', 'provides': 'provides', 'requires': 'requires', 'resources': 'resources', 'series': 'series', 'storage': 'storage', 'subordinate': 'subordinate', 'summary': 'summary', 'tags': 'tags', 'terms': 'terms'}
+    _toPy = {'categories': 'categories', 'description': 'description', 'extra-bindings': 'extra_bindings', 'min-juju-version': 'min_juju_version', 'name': 'name', 'payload-classes': 'payload_classes', 'peers': 'peers', 'provides': 'provides', 'requires': 'requires', 'resources': 'resources', 'series': 'series', 'storage': 'storage', 'subordinate': 'subordinate', 'summary': 'summary', 'tags': 'tags', 'terms': 'terms'}
+    def __init__(self, categories=None, description=None, extra_bindings=None, min_juju_version=None, name=None, payload_classes=None, peers=None, provides=None, requires=None, resources=None, series=None, storage=None, subordinate=None, summary=None, tags=None, terms=None):
+        '''
+        categories : typing.Sequence<+T_co>[str]
+        description : str
+        extra_bindings : typing.Mapping<~KT, +VT_co>[str, str]
+        min_juju_version : str
+        name : str
+        payload_classes : typing.Mapping<~KT, +VT_co>[str, ~CharmPayloadClass]<~CharmPayloadClass>
+        peers : typing.Mapping<~KT, +VT_co>[str, ~CharmRelation]<~CharmRelation>
+        provides : typing.Mapping<~KT, +VT_co>[str, ~CharmRelation]<~CharmRelation>
+        requires : typing.Mapping<~KT, +VT_co>[str, ~CharmRelation]<~CharmRelation>
+        resources : typing.Mapping<~KT, +VT_co>[str, ~CharmResourceMeta]<~CharmResourceMeta>
+        series : typing.Sequence<+T_co>[str]
+        storage : typing.Mapping<~KT, +VT_co>[str, ~CharmStorage]<~CharmStorage>
+        subordinate : bool
+        summary : str
+        tags : typing.Sequence<+T_co>[str]
+        terms : typing.Sequence<+T_co>[str]
+        '''
+        self.categories = categories
+        self.description = description
+        self.extra_bindings = extra_bindings
+        self.min_juju_version = min_juju_version
+        self.name = name
+        self.payload_classes = payload_classes
+        self.peers = peers
+        self.provides = provides
+        self.requires = requires
+        self.resources = resources
+        self.series = series
+        self.storage = storage
+        self.subordinate = subordinate
+        self.summary = summary
+        self.tags = tags
+        self.terms = terms
+
+
+class CharmMetric(Type):
+    _toSchema = {'description': 'description', 'type_': 'type'}
+    _toPy = {'description': 'description', 'type': 'type_'}
+    def __init__(self, description=None, type_=None):
+        '''
+        description : str
+        type_ : str
+        '''
+        self.description = description
+        self.type_ = type_
+
+
+class CharmMetrics(Type):
+    _toSchema = {'metrics': 'metrics', 'plan': 'plan'}
+    _toPy = {'metrics': 'metrics', 'plan': 'plan'}
+    def __init__(self, metrics=None, plan=None):
+        '''
+        metrics : typing.Mapping<~KT, +VT_co>[str, ~CharmMetric]<~CharmMetric>
+        plan : CharmPlan
+        '''
+        self.metrics = metrics
+        self.plan = CharmPlan.from_json(plan) if plan else None
+
+
+class CharmOption(Type):
+    _toSchema = {'default': 'default', 'description': 'description', 'type_': 'type'}
+    _toPy = {'default': 'default', 'description': 'description', 'type': 'type_'}
+    def __init__(self, default=None, description=None, type_=None):
+        '''
+        default : typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        description : str
+        type_ : str
+        '''
+        self.default = default
+        self.description = description
+        self.type_ = type_
+
+
+class CharmPayloadClass(Type):
+    _toSchema = {'name': 'name', 'type_': 'type'}
+    _toPy = {'name': 'name', 'type': 'type_'}
+    def __init__(self, name=None, type_=None):
+        '''
+        name : str
+        type_ : str
+        '''
+        self.name = name
+        self.type_ = type_
+
+
+class CharmPlan(Type):
+    _toSchema = {'required': 'required'}
+    _toPy = {'required': 'required'}
+    def __init__(self, required=None):
+        '''
+        required : bool
+        '''
+        self.required = required
+
+
+class CharmResourceMeta(Type):
+    _toSchema = {'description': 'description', 'name': 'name', 'path': 'path', 'type_': 'type'}
+    _toPy = {'description': 'description', 'name': 'name', 'path': 'path', 'type': 'type_'}
+    def __init__(self, description=None, name=None, path=None, type_=None):
+        '''
+        description : str
+        name : str
+        path : str
+        type_ : str
+        '''
+        self.description = description
+        self.name = name
+        self.path = path
+        self.type_ = type_
+
+
+class CharmStorage(Type):
+    _toSchema = {'count_max': 'count-max', 'count_min': 'count-min', 'description': 'description', 'location': 'location', 'minimum_size': 'minimum-size', 'name': 'name', 'properties': 'properties', 'read_only': 'read-only', 'shared': 'shared', 'type_': 'type'}
+    _toPy = {'count-max': 'count_max', 'count-min': 'count_min', 'description': 'description', 'location': 'location', 'minimum-size': 'minimum_size', 'name': 'name', 'properties': 'properties', 'read-only': 'read_only', 'shared': 'shared', 'type': 'type_'}
+    def __init__(self, count_max=None, count_min=None, description=None, location=None, minimum_size=None, name=None, properties=None, read_only=None, shared=None, type_=None):
+        '''
+        count_max : int
+        count_min : int
+        description : str
+        location : str
+        minimum_size : int
+        name : str
+        properties : typing.Sequence<+T_co>[str]
+        read_only : bool
+        shared : bool
+        type_ : str
+        '''
+        self.count_max = count_max
+        self.count_min = count_min
+        self.description = description
+        self.location = location
+        self.minimum_size = minimum_size
+        self.name = name
+        self.properties = properties
+        self.read_only = read_only
+        self.shared = shared
+        self.type_ = type_
+
+
+class CharmURL(Type):
+    _toSchema = {'url': 'url'}
+    _toPy = {'url': 'url'}
+    def __init__(self, url=None):
+        '''
+        url : str
+        '''
+        self.url = url
+
+
+class CharmsList(Type):
+    _toSchema = {'names': 'names'}
+    _toPy = {'names': 'names'}
+    def __init__(self, names=None):
+        '''
+        names : typing.Sequence<+T_co>[str]
+        '''
+        self.names = names
+
+
+class CharmsListResult(Type):
+    _toSchema = {'charm_urls': 'charm-urls'}
+    _toPy = {'charm-urls': 'charm_urls'}
+    def __init__(self, charm_urls=None):
+        '''
+        charm_urls : typing.Sequence<+T_co>[str]
+        '''
+        self.charm_urls = charm_urls
+
+
+class IsMeteredResult(Type):
+    _toSchema = {'metered': 'metered'}
+    _toPy = {'metered': 'metered'}
+    def __init__(self, metered=None):
+        '''
+        metered : bool
+        '''
+        self.metered = metered
+
+
+class APIHostPortsResult(Type):
+    _toSchema = {'servers': 'servers'}
+    _toPy = {'servers': 'servers'}
+    def __init__(self, servers=None):
+        '''
+        servers : typing.Sequence<+T_co>[~HostPort]<~HostPort>
         '''
         self.servers = [HostPort.from_json(o) for o in servers or []]
 
 
 class AddCharm(Type):
-    _toSchema = {'url': 'URL', 'channel': 'Channel'}
-    _toPy = {'URL': 'url', 'Channel': 'channel'}
+    _toSchema = {'channel': 'channel', 'url': 'url'}
+    _toPy = {'channel': 'channel', 'url': 'url'}
     def __init__(self, channel=None, url=None):
         '''
         channel : str
@@ -1159,62 +1461,62 @@ class AddCharm(Type):
 
 
 class AddCharmWithAuthorization(Type):
-    _toSchema = {'url': 'URL', 'channel': 'Channel', 'charmstoremacaroon': 'CharmStoreMacaroon'}
-    _toPy = {'URL': 'url', 'CharmStoreMacaroon': 'charmstoremacaroon', 'Channel': 'channel'}
-    def __init__(self, channel=None, charmstoremacaroon=None, url=None):
+    _toSchema = {'channel': 'channel', 'macaroon': 'macaroon', 'url': 'url'}
+    _toPy = {'channel': 'channel', 'macaroon': 'macaroon', 'url': 'url'}
+    def __init__(self, channel=None, macaroon=None, url=None):
         '''
         channel : str
-        charmstoremacaroon : Macaroon
+        macaroon : Macaroon
         url : str
         '''
         self.channel = channel
-        self.charmstoremacaroon = Macaroon.from_json(charmstoremacaroon) if charmstoremacaroon else None
+        self.macaroon = Macaroon.from_json(macaroon) if macaroon else None
         self.url = url
 
 
 class AddMachineParams(Type):
-    _toSchema = {'jobs': 'Jobs', 'series': 'Series', 'hardwarecharacteristics': 'HardwareCharacteristics', 'nonce': 'Nonce', 'containertype': 'ContainerType', 'constraints': 'Constraints', 'disks': 'Disks', 'placement': 'Placement', 'instanceid': 'InstanceId', 'parentid': 'ParentId', 'addrs': 'Addrs'}
-    _toPy = {'Constraints': 'constraints', 'InstanceId': 'instanceid', 'ContainerType': 'containertype', 'Nonce': 'nonce', 'Disks': 'disks', 'Addrs': 'addrs', 'HardwareCharacteristics': 'hardwarecharacteristics', 'Series': 'series', 'ParentId': 'parentid', 'Placement': 'placement', 'Jobs': 'jobs'}
-    def __init__(self, addrs=None, constraints=None, containertype=None, disks=None, hardwarecharacteristics=None, instanceid=None, jobs=None, nonce=None, parentid=None, placement=None, series=None):
+    _toSchema = {'addresses': 'addresses', 'constraints': 'constraints', 'container_type': 'container-type', 'disks': 'disks', 'hardware_characteristics': 'hardware-characteristics', 'instance_id': 'instance-id', 'jobs': 'jobs', 'nonce': 'nonce', 'parent_id': 'parent-id', 'placement': 'placement', 'series': 'series'}
+    _toPy = {'addresses': 'addresses', 'constraints': 'constraints', 'container-type': 'container_type', 'disks': 'disks', 'hardware-characteristics': 'hardware_characteristics', 'instance-id': 'instance_id', 'jobs': 'jobs', 'nonce': 'nonce', 'parent-id': 'parent_id', 'placement': 'placement', 'series': 'series'}
+    def __init__(self, addresses=None, constraints=None, container_type=None, disks=None, hardware_characteristics=None, instance_id=None, jobs=None, nonce=None, parent_id=None, placement=None, series=None):
         '''
-        addrs : typing.Sequence[~Address]
+        addresses : typing.Sequence<+T_co>[~Address]<~Address>
         constraints : Value
-        containertype : str
-        disks : typing.Sequence[~Constraints]
-        hardwarecharacteristics : HardwareCharacteristics
-        instanceid : str
-        jobs : typing.Sequence[str]
+        container_type : str
+        disks : typing.Sequence<+T_co>[~Constraints]<~Constraints>
+        hardware_characteristics : HardwareCharacteristics
+        instance_id : str
+        jobs : typing.Sequence<+T_co>[str]
         nonce : str
-        parentid : str
+        parent_id : str
         placement : Placement
         series : str
         '''
-        self.addrs = [Address.from_json(o) for o in addrs or []]
+        self.addresses = [Address.from_json(o) for o in addresses or []]
         self.constraints = Value.from_json(constraints) if constraints else None
-        self.containertype = containertype
+        self.container_type = container_type
         self.disks = [Constraints.from_json(o) for o in disks or []]
-        self.hardwarecharacteristics = HardwareCharacteristics.from_json(hardwarecharacteristics) if hardwarecharacteristics else None
-        self.instanceid = instanceid
+        self.hardware_characteristics = HardwareCharacteristics.from_json(hardware_characteristics) if hardware_characteristics else None
+        self.instance_id = instance_id
         self.jobs = jobs
         self.nonce = nonce
-        self.parentid = parentid
+        self.parent_id = parent_id
         self.placement = Placement.from_json(placement) if placement else None
         self.series = series
 
 
 class AddMachines(Type):
-    _toSchema = {'machineparams': 'MachineParams'}
-    _toPy = {'MachineParams': 'machineparams'}
-    def __init__(self, machineparams=None):
+    _toSchema = {'params': 'params'}
+    _toPy = {'params': 'params'}
+    def __init__(self, params=None):
         '''
-        machineparams : typing.Sequence[~AddMachineParams]
+        params : typing.Sequence<+T_co>[~AddMachineParams]<~AddMachineParams>
         '''
-        self.machineparams = [AddMachineParams.from_json(o) for o in machineparams or []]
+        self.params = [AddMachineParams.from_json(o) for o in params or []]
 
 
 class AddMachinesResult(Type):
-    _toSchema = {'error': 'Error', 'machine': 'Machine'}
-    _toPy = {'Error': 'error', 'Machine': 'machine'}
+    _toSchema = {'error': 'error', 'machine': 'machine'}
+    _toPy = {'error': 'error', 'machine': 'machine'}
     def __init__(self, error=None, machine=None):
         '''
         error : Error
@@ -1225,90 +1527,86 @@ class AddMachinesResult(Type):
 
 
 class AddMachinesResults(Type):
-    _toSchema = {'machines': 'Machines'}
-    _toPy = {'Machines': 'machines'}
+    _toSchema = {'machines': 'machines'}
+    _toPy = {'machines': 'machines'}
     def __init__(self, machines=None):
         '''
-        machines : typing.Sequence[~AddMachinesResult]
+        machines : typing.Sequence<+T_co>[~AddMachinesResult]<~AddMachinesResult>
         '''
         self.machines = [AddMachinesResult.from_json(o) for o in machines or []]
 
 
 class Address(Type):
-    _toSchema = {'value': 'Value', 'type_': 'Type', 'spacename': 'SpaceName', 'scope': 'Scope'}
-    _toPy = {'Value': 'value', 'Type': 'type_', 'SpaceName': 'spacename', 'Scope': 'scope'}
-    def __init__(self, scope=None, spacename=None, type_=None, value=None):
+    _toSchema = {'scope': 'scope', 'space_name': 'space-name', 'type_': 'type', 'value': 'value'}
+    _toPy = {'scope': 'scope', 'space-name': 'space_name', 'type': 'type_', 'value': 'value'}
+    def __init__(self, scope=None, space_name=None, type_=None, value=None):
         '''
         scope : str
-        spacename : str
+        space_name : str
         type_ : str
         value : str
         '''
         self.scope = scope
-        self.spacename = spacename
+        self.space_name = space_name
         self.type_ = type_
         self.value = value
 
 
 class AgentVersionResult(Type):
-    _toSchema = {'minor': 'Minor', 'major': 'Major', 'patch': 'Patch', 'tag': 'Tag', 'build': 'Build'}
-    _toPy = {'Patch': 'patch', 'Major': 'major', 'Minor': 'minor', 'Tag': 'tag', 'Build': 'build'}
-    def __init__(self, build=None, major=None, minor=None, patch=None, tag=None):
+    _toSchema = {'version': 'version'}
+    _toPy = {'version': 'version'}
+    def __init__(self, version=None):
         '''
-        build : int
-        major : int
-        minor : int
-        patch : int
-        tag : str
+        version : Number
         '''
-        self.build = build
-        self.major = major
-        self.minor = minor
-        self.patch = patch
-        self.tag = tag
+        self.version = Number.from_json(version) if version else None
 
 
 class AllWatcherId(Type):
-    _toSchema = {'allwatcherid': 'AllWatcherId'}
-    _toPy = {'AllWatcherId': 'allwatcherid'}
-    def __init__(self, allwatcherid=None):
+    _toSchema = {'watcher_id': 'watcher-id'}
+    _toPy = {'watcher-id': 'watcher_id'}
+    def __init__(self, watcher_id=None):
         '''
-        allwatcherid : str
+        watcher_id : str
         '''
-        self.allwatcherid = allwatcherid
+        self.watcher_id = watcher_id
 
 
 class ApplicationStatus(Type):
-    _toSchema = {'charm': 'Charm', 'exposed': 'Exposed', 'err': 'Err', 'meterstatuses': 'MeterStatuses', 'relations': 'Relations', 'units': 'Units', 'life': 'Life', 'canupgradeto': 'CanUpgradeTo', 'subordinateto': 'SubordinateTo', 'status': 'Status'}
-    _toPy = {'Charm': 'charm', 'Err': 'err', 'Units': 'units', 'MeterStatuses': 'meterstatuses', 'CanUpgradeTo': 'canupgradeto', 'Status': 'status', 'SubordinateTo': 'subordinateto', 'Life': 'life', 'Relations': 'relations', 'Exposed': 'exposed'}
-    def __init__(self, canupgradeto=None, charm=None, err=None, exposed=None, life=None, meterstatuses=None, relations=None, status=None, subordinateto=None, units=None):
+    _toSchema = {'can_upgrade_to': 'can-upgrade-to', 'charm': 'charm', 'err': 'err', 'exposed': 'exposed', 'life': 'life', 'meter_statuses': 'meter-statuses', 'relations': 'relations', 'series': 'series', 'status': 'status', 'subordinate_to': 'subordinate-to', 'units': 'units', 'workload_version': 'workload-version'}
+    _toPy = {'can-upgrade-to': 'can_upgrade_to', 'charm': 'charm', 'err': 'err', 'exposed': 'exposed', 'life': 'life', 'meter-statuses': 'meter_statuses', 'relations': 'relations', 'series': 'series', 'status': 'status', 'subordinate-to': 'subordinate_to', 'units': 'units', 'workload-version': 'workload_version'}
+    def __init__(self, can_upgrade_to=None, charm=None, err=None, exposed=None, life=None, meter_statuses=None, relations=None, series=None, status=None, subordinate_to=None, units=None, workload_version=None):
         '''
-        canupgradeto : str
+        can_upgrade_to : str
         charm : str
-        err : typing.Mapping[str, typing.Any]
+        err : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         exposed : bool
         life : str
-        meterstatuses : typing.Mapping[str, ~MeterStatus]
-        relations : typing.Sequence[str]
+        meter_statuses : typing.Mapping<~KT, +VT_co>[str, ~MeterStatus]<~MeterStatus>
+        relations : typing.Sequence<+T_co>[str]
+        series : str
         status : DetailedStatus
-        subordinateto : typing.Sequence[str]
-        units : typing.Mapping[str, ~UnitStatus]
+        subordinate_to : typing.Sequence<+T_co>[str]
+        units : typing.Mapping<~KT, +VT_co>[str, ~UnitStatus]<~UnitStatus>
+        workload_version : str
         '''
-        self.canupgradeto = canupgradeto
+        self.can_upgrade_to = can_upgrade_to
         self.charm = charm
         self.err = err
         self.exposed = exposed
         self.life = life
-        self.meterstatuses = {k: MeterStatus.from_json(v) for k, v in (meterstatuses or dict()).items()}
+        self.meter_statuses = meter_statuses
         self.relations = relations
+        self.series = series
         self.status = DetailedStatus.from_json(status) if status else None
-        self.subordinateto = subordinateto
-        self.units = {k: UnitStatus.from_json(v) for k, v in (units or dict()).items()}
+        self.subordinate_to = subordinate_to
+        self.units = units
+        self.workload_version = workload_version
 
 
 class Binary(Type):
-    _toSchema = {'number': 'Number', 'series': 'Series', 'arch': 'Arch'}
-    _toPy = {'Number': 'number', 'Arch': 'arch', 'Series': 'series'}
+    _toSchema = {'arch': 'Arch', 'number': 'Number', 'series': 'Series'}
+    _toPy = {'Arch': 'arch', 'Number': 'number', 'Series': 'series'}
     def __init__(self, arch=None, number=None, series=None):
         '''
         arch : str
@@ -1320,41 +1618,37 @@ class Binary(Type):
         self.series = series
 
 
-class BundleChangesChange(Type):
-    _toSchema = {'method': 'method', 'args': 'args', 'requires': 'requires', 'id_': 'id'}
-    _toPy = {'method': 'method', 'id': 'id_', 'args': 'args', 'requires': 'requires'}
-    def __init__(self, args=None, id_=None, method=None, requires=None):
+class ConfigValue(Type):
+    _toSchema = {'source': 'source', 'value': 'value'}
+    _toPy = {'source': 'source', 'value': 'value'}
+    def __init__(self, source=None, value=None):
         '''
-        args : typing.Sequence[typing.Any]
-        id_ : str
-        method : str
-        requires : typing.Sequence[str]
+        source : str
+        value : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         '''
-        self.args = args
-        self.id_ = id_
-        self.method = method
-        self.requires = requires
+        self.source = source
+        self.value = value
 
 
 class DestroyMachines(Type):
-    _toSchema = {'force': 'Force', 'machinenames': 'MachineNames'}
-    _toPy = {'Force': 'force', 'MachineNames': 'machinenames'}
-    def __init__(self, force=None, machinenames=None):
+    _toSchema = {'force': 'force', 'machine_names': 'machine-names'}
+    _toPy = {'force': 'force', 'machine-names': 'machine_names'}
+    def __init__(self, force=None, machine_names=None):
         '''
         force : bool
-        machinenames : typing.Sequence[str]
+        machine_names : typing.Sequence<+T_co>[str]
         '''
         self.force = force
-        self.machinenames = machinenames
+        self.machine_names = machine_names
 
 
 class DetailedStatus(Type):
-    _toSchema = {'since': 'Since', 'data': 'Data', 'life': 'Life', 'version': 'Version', 'err': 'Err', 'kind': 'Kind', 'info': 'Info', 'status': 'Status'}
-    _toPy = {'Err': 'err', 'Data': 'data', 'Since': 'since', 'Status': 'status', 'Info': 'info', 'Life': 'life', 'Version': 'version', 'Kind': 'kind'}
+    _toSchema = {'data': 'data', 'err': 'err', 'info': 'info', 'kind': 'kind', 'life': 'life', 'since': 'since', 'status': 'status', 'version': 'version'}
+    _toPy = {'data': 'data', 'err': 'err', 'info': 'info', 'kind': 'kind', 'life': 'life', 'since': 'since', 'status': 'status', 'version': 'version'}
     def __init__(self, data=None, err=None, info=None, kind=None, life=None, since=None, status=None, version=None):
         '''
-        data : typing.Mapping[str, typing.Any]
-        err : typing.Mapping[str, typing.Any]
+        data : typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        err : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         info : str
         kind : str
         life : str
@@ -1373,27 +1667,27 @@ class DetailedStatus(Type):
 
 
 class EndpointStatus(Type):
-    _toSchema = {'role': 'Role', 'subordinate': 'Subordinate', 'applicationname': 'ApplicationName', 'name': 'Name'}
-    _toPy = {'Subordinate': 'subordinate', 'Name': 'name', 'Role': 'role', 'ApplicationName': 'applicationname'}
-    def __init__(self, applicationname=None, name=None, role=None, subordinate=None):
+    _toSchema = {'application': 'application', 'name': 'name', 'role': 'role', 'subordinate': 'subordinate'}
+    _toPy = {'application': 'application', 'name': 'name', 'role': 'role', 'subordinate': 'subordinate'}
+    def __init__(self, application=None, name=None, role=None, subordinate=None):
         '''
-        applicationname : str
+        application : str
         name : str
         role : str
         subordinate : bool
         '''
-        self.applicationname = applicationname
+        self.application = application
         self.name = name
         self.role = role
         self.subordinate = subordinate
 
 
 class EntityStatus(Type):
-    _toSchema = {'since': 'Since', 'data': 'Data', 'info': 'Info', 'status': 'Status'}
-    _toPy = {'Since': 'since', 'Status': 'status', 'Data': 'data', 'Info': 'info'}
+    _toSchema = {'data': 'data', 'info': 'info', 'since': 'since', 'status': 'status'}
+    _toPy = {'data': 'data', 'info': 'info', 'since': 'since', 'status': 'status'}
     def __init__(self, data=None, info=None, since=None, status=None):
         '''
-        data : typing.Mapping[str, typing.Any]
+        data : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         info : str
         since : str
         status : str
@@ -1405,112 +1699,90 @@ class EntityStatus(Type):
 
 
 class FindToolsParams(Type):
-    _toSchema = {'minorversion': 'MinorVersion', 'number': 'Number', 'series': 'Series', 'arch': 'Arch', 'majorversion': 'MajorVersion'}
-    _toPy = {'Number': 'number', 'Series': 'series', 'Arch': 'arch', 'MinorVersion': 'minorversion', 'MajorVersion': 'majorversion'}
-    def __init__(self, arch=None, majorversion=None, minorversion=None, number=None, series=None):
+    _toSchema = {'arch': 'arch', 'major': 'major', 'minor': 'minor', 'number': 'number', 'series': 'series'}
+    _toPy = {'arch': 'arch', 'major': 'major', 'minor': 'minor', 'number': 'number', 'series': 'series'}
+    def __init__(self, arch=None, major=None, minor=None, number=None, series=None):
         '''
         arch : str
-        majorversion : int
-        minorversion : int
+        major : int
+        minor : int
         number : Number
         series : str
         '''
         self.arch = arch
-        self.majorversion = majorversion
-        self.minorversion = minorversion
+        self.major = major
+        self.minor = minor
         self.number = Number.from_json(number) if number else None
         self.series = series
 
 
 class FindToolsResult(Type):
-    _toSchema = {'error': 'Error', 'list_': 'List'}
-    _toPy = {'List': 'list_', 'Error': 'error'}
+    _toSchema = {'error': 'error', 'list_': 'list'}
+    _toPy = {'error': 'error', 'list': 'list_'}
     def __init__(self, error=None, list_=None):
         '''
         error : Error
-        list_ : typing.Sequence[~Tools]
+        list_ : typing.Sequence<+T_co>[~Tools]<~Tools>
         '''
         self.error = Error.from_json(error) if error else None
         self.list_ = [Tools.from_json(o) for o in list_ or []]
 
 
 class FullStatus(Type):
-    _toSchema = {'modelname': 'ModelName', 'availableversion': 'AvailableVersion', 'applications': 'Applications', 'relations': 'Relations', 'machines': 'Machines'}
-    _toPy = {'Applications': 'applications', 'Machines': 'machines', 'AvailableVersion': 'availableversion', 'ModelName': 'modelname', 'Relations': 'relations'}
-    def __init__(self, applications=None, availableversion=None, machines=None, modelname=None, relations=None):
-        '''
-        applications : typing.Mapping[str, ~ApplicationStatus]
-        availableversion : str
-        machines : typing.Mapping[str, ~MachineStatus]
-        modelname : str
-        relations : typing.Sequence[~RelationStatus]
-        '''
-        self.applications = {k: ApplicationStatus.from_json(v) for k, v in (applications or dict()).items()}
-        self.availableversion = availableversion
-        self.machines = {k: MachineStatus.from_json(v) for k, v in (machines or dict()).items()}
-        self.modelname = modelname
-        self.relations = [RelationStatus.from_json(o) for o in relations or []]
-
-
-class GetBundleChangesParams(Type):
-    _toSchema = {'yaml': 'yaml'}
-    _toPy = {'yaml': 'yaml'}
-    def __init__(self, yaml=None):
-        '''
-        yaml : str
-        '''
-        self.yaml = yaml
-
-
-class GetBundleChangesResults(Type):
-    _toSchema = {'changes': 'changes', 'errors': 'errors'}
-    _toPy = {'changes': 'changes', 'errors': 'errors'}
-    def __init__(self, changes=None, errors=None):
+    _toSchema = {'applications': 'applications', 'machines': 'machines', 'model': 'model', 'relations': 'relations', 'remote_applications': 'remote-applications'}
+    _toPy = {'applications': 'applications', 'machines': 'machines', 'model': 'model', 'relations': 'relations', 'remote-applications': 'remote_applications'}
+    def __init__(self, applications=None, machines=None, model=None, relations=None, remote_applications=None):
         '''
-        changes : typing.Sequence[~BundleChangesChange]
-        errors : typing.Sequence[str]
+        applications : typing.Mapping<~KT, +VT_co>[str, ~ApplicationStatus]<~ApplicationStatus>
+        machines : typing.Mapping<~KT, +VT_co>[str, ~MachineStatus]<~MachineStatus>
+        model : ModelStatusInfo
+        relations : typing.Sequence<+T_co>[~RelationStatus]<~RelationStatus>
+        remote_applications : typing.Mapping<~KT, +VT_co>[str, ~RemoteApplicationStatus]<~RemoteApplicationStatus>
         '''
-        self.changes = [BundleChangesChange.from_json(o) for o in changes or []]
-        self.errors = errors
+        self.applications = applications
+        self.machines = machines
+        self.model = ModelStatusInfo.from_json(model) if model else None
+        self.relations = [RelationStatus.from_json(o) for o in relations or []]
+        self.remote_applications = remote_applications
 
 
 class HardwareCharacteristics(Type):
-    _toSchema = {'rootdisk': 'RootDisk', 'cpucores': 'CpuCores', 'mem': 'Mem', 'tags': 'Tags', 'arch': 'Arch', 'availabilityzone': 'AvailabilityZone', 'cpupower': 'CpuPower'}
-    _toPy = {'CpuPower': 'cpupower', 'RootDisk': 'rootdisk', 'AvailabilityZone': 'availabilityzone', 'Mem': 'mem', 'CpuCores': 'cpucores', 'Tags': 'tags', 'Arch': 'arch'}
-    def __init__(self, arch=None, availabilityzone=None, cpucores=None, cpupower=None, mem=None, rootdisk=None, tags=None):
+    _toSchema = {'arch': 'arch', 'availability_zone': 'availability-zone', 'cpu_cores': 'cpu-cores', 'cpu_power': 'cpu-power', 'mem': 'mem', 'root_disk': 'root-disk', 'tags': 'tags'}
+    _toPy = {'arch': 'arch', 'availability-zone': 'availability_zone', 'cpu-cores': 'cpu_cores', 'cpu-power': 'cpu_power', 'mem': 'mem', 'root-disk': 'root_disk', 'tags': 'tags'}
+    def __init__(self, arch=None, availability_zone=None, cpu_cores=None, cpu_power=None, mem=None, root_disk=None, tags=None):
         '''
         arch : str
-        availabilityzone : str
-        cpucores : int
-        cpupower : int
+        availability_zone : str
+        cpu_cores : int
+        cpu_power : int
         mem : int
-        rootdisk : int
-        tags : typing.Sequence[str]
+        root_disk : int
+        tags : typing.Sequence<+T_co>[str]
         '''
         self.arch = arch
-        self.availabilityzone = availabilityzone
-        self.cpucores = cpucores
-        self.cpupower = cpupower
+        self.availability_zone = availability_zone
+        self.cpu_cores = cpu_cores
+        self.cpu_power = cpu_power
         self.mem = mem
-        self.rootdisk = rootdisk
+        self.root_disk = root_disk
         self.tags = tags
 
 
 class History(Type):
-    _toSchema = {'error': 'Error', 'statuses': 'Statuses'}
-    _toPy = {'Error': 'error', 'Statuses': 'statuses'}
+    _toSchema = {'error': 'error', 'statuses': 'statuses'}
+    _toPy = {'error': 'error', 'statuses': 'statuses'}
     def __init__(self, error=None, statuses=None):
         '''
         error : Error
-        statuses : typing.Sequence[~DetailedStatus]
+        statuses : typing.Sequence<+T_co>[~DetailedStatus]<~DetailedStatus>
         '''
         self.error = Error.from_json(error) if error else None
         self.statuses = [DetailedStatus.from_json(o) for o in statuses or []]
 
 
 class HostPort(Type):
-    _toSchema = {'address': 'Address', 'port': 'Port'}
-    _toPy = {'Port': 'port', 'Address': 'address'}
+    _toSchema = {'address': 'Address', 'port': 'port'}
+    _toPy = {'Address': 'address', 'port': 'port'}
     def __init__(self, address=None, port=None):
         '''
         address : Address
@@ -1520,39 +1792,63 @@ class HostPort(Type):
         self.port = port
 
 
+class MachineHardware(Type):
+    _toSchema = {'arch': 'arch', 'availability_zone': 'availability-zone', 'cores': 'cores', 'cpu_power': 'cpu-power', 'mem': 'mem', 'root_disk': 'root-disk', 'tags': 'tags'}
+    _toPy = {'arch': 'arch', 'availability-zone': 'availability_zone', 'cores': 'cores', 'cpu-power': 'cpu_power', 'mem': 'mem', 'root-disk': 'root_disk', 'tags': 'tags'}
+    def __init__(self, arch=None, availability_zone=None, cores=None, cpu_power=None, mem=None, root_disk=None, tags=None):
+        '''
+        arch : str
+        availability_zone : str
+        cores : int
+        cpu_power : int
+        mem : int
+        root_disk : int
+        tags : typing.Sequence<+T_co>[str]
+        '''
+        self.arch = arch
+        self.availability_zone = availability_zone
+        self.cores = cores
+        self.cpu_power = cpu_power
+        self.mem = mem
+        self.root_disk = root_disk
+        self.tags = tags
+
+
 class MachineStatus(Type):
-    _toSchema = {'dnsname': 'DNSName', 'hardware': 'Hardware', 'series': 'Series', 'id_': 'Id', 'hasvote': 'HasVote', 'jobs': 'Jobs', 'containers': 'Containers', 'agentstatus': 'AgentStatus', 'instanceid': 'InstanceId', 'wantsvote': 'WantsVote', 'instancestatus': 'InstanceStatus'}
-    _toPy = {'AgentStatus': 'agentstatus', 'InstanceId': 'instanceid', 'Hardware': 'hardware', 'HasVote': 'hasvote', 'Containers': 'containers', 'Id': 'id_', 'WantsVote': 'wantsvote', 'Series': 'series', 'DNSName': 'dnsname', 'InstanceStatus': 'instancestatus', 'Jobs': 'jobs'}
-    def __init__(self, agentstatus=None, containers=None, dnsname=None, hardware=None, hasvote=None, id_=None, instanceid=None, instancestatus=None, jobs=None, series=None, wantsvote=None):
+    _toSchema = {'agent_status': 'agent-status', 'containers': 'containers', 'dns_name': 'dns-name', 'hardware': 'hardware', 'has_vote': 'has-vote', 'id_': 'id', 'instance_id': 'instance-id', 'instance_status': 'instance-status', 'ip_addresses': 'ip-addresses', 'jobs': 'jobs', 'series': 'series', 'wants_vote': 'wants-vote'}
+    _toPy = {'agent-status': 'agent_status', 'containers': 'containers', 'dns-name': 'dns_name', 'hardware': 'hardware', 'has-vote': 'has_vote', 'id': 'id_', 'instance-id': 'instance_id', 'instance-status': 'instance_status', 'ip-addresses': 'ip_addresses', 'jobs': 'jobs', 'series': 'series', 'wants-vote': 'wants_vote'}
+    def __init__(self, agent_status=None, containers=None, dns_name=None, hardware=None, has_vote=None, id_=None, instance_id=None, instance_status=None, ip_addresses=None, jobs=None, series=None, wants_vote=None):
         '''
-        agentstatus : DetailedStatus
-        containers : typing.Mapping[str, ~MachineStatus]
-        dnsname : str
+        agent_status : DetailedStatus
+        containers : typing.Mapping<~KT, +VT_co>[str, ~MachineStatus]<~MachineStatus>
+        dns_name : str
         hardware : str
-        hasvote : bool
+        has_vote : bool
         id_ : str
-        instanceid : str
-        instancestatus : DetailedStatus
-        jobs : typing.Sequence[str]
+        instance_id : str
+        instance_status : DetailedStatus
+        ip_addresses : typing.Sequence<+T_co>[str]
+        jobs : typing.Sequence<+T_co>[str]
         series : str
-        wantsvote : bool
+        wants_vote : bool
         '''
-        self.agentstatus = DetailedStatus.from_json(agentstatus) if agentstatus else None
-        self.containers = {k: MachineStatus.from_json(v) for k, v in (containers or dict()).items()}
-        self.dnsname = dnsname
+        self.agent_status = DetailedStatus.from_json(agent_status) if agent_status else None
+        self.containers = containers
+        self.dns_name = dns_name
         self.hardware = hardware
-        self.hasvote = hasvote
+        self.has_vote = has_vote
         self.id_ = id_
-        self.instanceid = instanceid
-        self.instancestatus = DetailedStatus.from_json(instancestatus) if instancestatus else None
+        self.instance_id = instance_id
+        self.instance_status = DetailedStatus.from_json(instance_status) if instance_status else None
+        self.ip_addresses = ip_addresses
         self.jobs = jobs
         self.series = series
-        self.wantsvote = wantsvote
+        self.wants_vote = wants_vote
 
 
 class MeterStatus(Type):
-    _toSchema = {'color': 'Color', 'message': 'Message'}
-    _toPy = {'Message': 'message', 'Color': 'color'}
+    _toSchema = {'color': 'color', 'message': 'message'}
+    _toPy = {'color': 'color', 'message': 'message'}
     def __init__(self, color=None, message=None):
         '''
         color : str
@@ -1563,82 +1859,128 @@ class MeterStatus(Type):
 
 
 class ModelConfigResults(Type):
-    _toSchema = {'config': 'Config'}
-    _toPy = {'Config': 'config'}
+    _toSchema = {'config': 'config'}
+    _toPy = {'config': 'config'}
     def __init__(self, config=None):
         '''
-        config : typing.Mapping[str, typing.Any]
+        config : typing.Mapping<~KT, +VT_co>[str, ~ConfigValue]<~ConfigValue>
         '''
         self.config = config
 
 
 class ModelInfo(Type):
-    _toSchema = {'uuid': 'UUID', 'cloud': 'Cloud', 'life': 'Life', 'users': 'Users', 'name': 'Name', 'serveruuid': 'ServerUUID', 'defaultseries': 'DefaultSeries', 'ownertag': 'OwnerTag', 'providertype': 'ProviderType', 'status': 'Status'}
-    _toPy = {'OwnerTag': 'ownertag', 'Cloud': 'cloud', 'DefaultSeries': 'defaultseries', 'Name': 'name', 'UUID': 'uuid', 'Status': 'status', 'ServerUUID': 'serveruuid', 'Users': 'users', 'Life': 'life', 'ProviderType': 'providertype'}
-    def __init__(self, cloud=None, defaultseries=None, life=None, name=None, ownertag=None, providertype=None, serveruuid=None, status=None, uuid=None, users=None):
-        '''
-        cloud : str
-        defaultseries : str
+    _toSchema = {'cloud_credential_tag': 'cloud-credential-tag', 'cloud_region': 'cloud-region', 'cloud_tag': 'cloud-tag', 'controller_uuid': 'controller-uuid', 'default_series': 'default-series', 'life': 'life', 'machines': 'machines', 'name': 'name', 'owner_tag': 'owner-tag', 'provider_type': 'provider-type', 'status': 'status', 'users': 'users', 'uuid': 'uuid'}
+    _toPy = {'cloud-credential-tag': 'cloud_credential_tag', 'cloud-region': 'cloud_region', 'cloud-tag': 'cloud_tag', 'controller-uuid': 'controller_uuid', 'default-series': 'default_series', 'life': 'life', 'machines': 'machines', 'name': 'name', 'owner-tag': 'owner_tag', 'provider-type': 'provider_type', 'status': 'status', 'users': 'users', 'uuid': 'uuid'}
+    def __init__(self, cloud_credential_tag=None, cloud_region=None, cloud_tag=None, controller_uuid=None, default_series=None, life=None, machines=None, name=None, owner_tag=None, provider_type=None, status=None, users=None, uuid=None):
+        '''
+        cloud_credential_tag : str
+        cloud_region : str
+        cloud_tag : str
+        controller_uuid : str
+        default_series : str
         life : str
+        machines : typing.Sequence<+T_co>[~ModelMachineInfo]<~ModelMachineInfo>
         name : str
-        ownertag : str
-        providertype : str
-        serveruuid : str
+        owner_tag : str
+        provider_type : str
         status : EntityStatus
+        users : typing.Sequence<+T_co>[~ModelUserInfo]<~ModelUserInfo>
         uuid : str
-        users : typing.Sequence[~ModelUserInfo]
         '''
-        self.cloud = cloud
-        self.defaultseries = defaultseries
+        self.cloud_credential_tag = cloud_credential_tag
+        self.cloud_region = cloud_region
+        self.cloud_tag = cloud_tag
+        self.controller_uuid = controller_uuid
+        self.default_series = default_series
         self.life = life
+        self.machines = [ModelMachineInfo.from_json(o) for o in machines or []]
         self.name = name
-        self.ownertag = ownertag
-        self.providertype = providertype
-        self.serveruuid = serveruuid
+        self.owner_tag = owner_tag
+        self.provider_type = provider_type
         self.status = EntityStatus.from_json(status) if status else None
-        self.uuid = uuid
         self.users = [ModelUserInfo.from_json(o) for o in users or []]
+        self.uuid = uuid
+
+
+class ModelMachineInfo(Type):
+    _toSchema = {'hardware': 'hardware', 'has_vote': 'has-vote', 'id_': 'id', 'instance_id': 'instance-id', 'status': 'status', 'wants_vote': 'wants-vote'}
+    _toPy = {'hardware': 'hardware', 'has-vote': 'has_vote', 'id': 'id_', 'instance-id': 'instance_id', 'status': 'status', 'wants-vote': 'wants_vote'}
+    def __init__(self, hardware=None, has_vote=None, id_=None, instance_id=None, status=None, wants_vote=None):
+        '''
+        hardware : MachineHardware
+        has_vote : bool
+        id_ : str
+        instance_id : str
+        status : str
+        wants_vote : bool
+        '''
+        self.hardware = MachineHardware.from_json(hardware) if hardware else None
+        self.has_vote = has_vote
+        self.id_ = id_
+        self.instance_id = instance_id
+        self.status = status
+        self.wants_vote = wants_vote
 
 
 class ModelSet(Type):
-    _toSchema = {'config': 'Config'}
-    _toPy = {'Config': 'config'}
+    _toSchema = {'config': 'config'}
+    _toPy = {'config': 'config'}
     def __init__(self, config=None):
         '''
-        config : typing.Mapping[str, typing.Any]
+        config : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         '''
         self.config = config
 
 
+class ModelStatusInfo(Type):
+    _toSchema = {'available_version': 'available-version', 'cloud_tag': 'cloud-tag', 'migration': 'migration', 'name': 'name', 'region': 'region', 'version': 'version'}
+    _toPy = {'available-version': 'available_version', 'cloud-tag': 'cloud_tag', 'migration': 'migration', 'name': 'name', 'region': 'region', 'version': 'version'}
+    def __init__(self, available_version=None, cloud_tag=None, migration=None, name=None, region=None, version=None):
+        '''
+        available_version : str
+        cloud_tag : str
+        migration : str
+        name : str
+        region : str
+        version : str
+        '''
+        self.available_version = available_version
+        self.cloud_tag = cloud_tag
+        self.migration = migration
+        self.name = name
+        self.region = region
+        self.version = version
+
+
 class ModelUnset(Type):
-    _toSchema = {'keys': 'Keys'}
-    _toPy = {'Keys': 'keys'}
+    _toSchema = {'keys': 'keys'}
+    _toPy = {'keys': 'keys'}
     def __init__(self, keys=None):
         '''
-        keys : typing.Sequence[str]
+        keys : typing.Sequence<+T_co>[str]
         '''
         self.keys = keys
 
 
 class ModelUserInfo(Type):
-    _toSchema = {'displayname': 'displayname', 'user': 'user', 'lastconnection': 'lastconnection', 'access': 'access'}
-    _toPy = {'displayname': 'displayname', 'user': 'user', 'lastconnection': 'lastconnection', 'access': 'access'}
-    def __init__(self, access=None, displayname=None, lastconnection=None, user=None):
+    _toSchema = {'access': 'access', 'display_name': 'display-name', 'last_connection': 'last-connection', 'user': 'user'}
+    _toPy = {'access': 'access', 'display-name': 'display_name', 'last-connection': 'last_connection', 'user': 'user'}
+    def __init__(self, access=None, display_name=None, last_connection=None, user=None):
         '''
         access : str
-        displayname : str
-        lastconnection : str
+        display_name : str
+        last_connection : str
         user : str
         '''
         self.access = access
-        self.displayname = displayname
-        self.lastconnection = lastconnection
+        self.display_name = display_name
+        self.last_connection = last_connection
         self.user = user
 
 
 class ModelUserInfoResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -1653,14 +1995,14 @@ class ModelUserInfoResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ModelUserInfoResult]
+        results : typing.Sequence<+T_co>[~ModelUserInfoResult]<~ModelUserInfoResult>
         '''
         self.results = [ModelUserInfoResult.from_json(o) for o in results or []]
 
 
 class PrivateAddress(Type):
-    _toSchema = {'target': 'Target'}
-    _toPy = {'Target': 'target'}
+    _toSchema = {'target': 'target'}
+    _toPy = {'target': 'target'}
     def __init__(self, target=None):
         '''
         target : str
@@ -1669,34 +2011,34 @@ class PrivateAddress(Type):
 
 
 class PrivateAddressResults(Type):
-    _toSchema = {'privateaddress': 'PrivateAddress'}
-    _toPy = {'PrivateAddress': 'privateaddress'}
-    def __init__(self, privateaddress=None):
+    _toSchema = {'private_address': 'private-address'}
+    _toPy = {'private-address': 'private_address'}
+    def __init__(self, private_address=None):
         '''
-        privateaddress : str
+        private_address : str
         '''
-        self.privateaddress = privateaddress
+        self.private_address = private_address
 
 
 class ProvisioningScriptParams(Type):
-    _toSchema = {'disablepackagecommands': 'DisablePackageCommands', 'machineid': 'MachineId', 'datadir': 'DataDir', 'nonce': 'Nonce'}
-    _toPy = {'MachineId': 'machineid', 'DisablePackageCommands': 'disablepackagecommands', 'DataDir': 'datadir', 'Nonce': 'nonce'}
-    def __init__(self, datadir=None, disablepackagecommands=None, machineid=None, nonce=None):
+    _toSchema = {'data_dir': 'data-dir', 'disable_package_commands': 'disable-package-commands', 'machine_id': 'machine-id', 'nonce': 'nonce'}
+    _toPy = {'data-dir': 'data_dir', 'disable-package-commands': 'disable_package_commands', 'machine-id': 'machine_id', 'nonce': 'nonce'}
+    def __init__(self, data_dir=None, disable_package_commands=None, machine_id=None, nonce=None):
         '''
-        datadir : str
-        disablepackagecommands : bool
-        machineid : str
+        data_dir : str
+        disable_package_commands : bool
+        machine_id : str
         nonce : str
         '''
-        self.datadir = datadir
-        self.disablepackagecommands = disablepackagecommands
-        self.machineid = machineid
+        self.data_dir = data_dir
+        self.disable_package_commands = disable_package_commands
+        self.machine_id = machine_id
         self.nonce = nonce
 
 
 class ProvisioningScriptResult(Type):
-    _toSchema = {'script': 'Script'}
-    _toPy = {'Script': 'script'}
+    _toSchema = {'script': 'script'}
+    _toPy = {'script': 'script'}
     def __init__(self, script=None):
         '''
         script : str
@@ -1705,8 +2047,8 @@ class ProvisioningScriptResult(Type):
 
 
 class PublicAddress(Type):
-    _toSchema = {'target': 'Target'}
-    _toPy = {'Target': 'target'}
+    _toSchema = {'target': 'target'}
+    _toPy = {'target': 'target'}
     def __init__(self, target=None):
         '''
         target : str
@@ -1715,21 +2057,21 @@ class PublicAddress(Type):
 
 
 class PublicAddressResults(Type):
-    _toSchema = {'publicaddress': 'PublicAddress'}
-    _toPy = {'PublicAddress': 'publicaddress'}
-    def __init__(self, publicaddress=None):
+    _toSchema = {'public_address': 'public-address'}
+    _toPy = {'public-address': 'public_address'}
+    def __init__(self, public_address=None):
         '''
-        publicaddress : str
+        public_address : str
         '''
-        self.publicaddress = publicaddress
+        self.public_address = public_address
 
 
 class RelationStatus(Type):
-    _toSchema = {'key': 'Key', 'endpoints': 'Endpoints', 'scope': 'Scope', 'id_': 'Id', 'interface': 'Interface'}
-    _toPy = {'Key': 'key', 'Interface': 'interface', 'Id': 'id_', 'Endpoints': 'endpoints', 'Scope': 'scope'}
+    _toSchema = {'endpoints': 'endpoints', 'id_': 'id', 'interface': 'interface', 'key': 'key', 'scope': 'scope'}
+    _toPy = {'endpoints': 'endpoints', 'id': 'id_', 'interface': 'interface', 'key': 'key', 'scope': 'scope'}
     def __init__(self, endpoints=None, id_=None, interface=None, key=None, scope=None):
         '''
-        endpoints : typing.Sequence[~EndpointStatus]
+        endpoints : typing.Sequence<+T_co>[~EndpointStatus]<~EndpointStatus>
         id_ : int
         interface : str
         key : str
@@ -1742,71 +2084,103 @@ class RelationStatus(Type):
         self.scope = scope
 
 
+class RemoteApplicationStatus(Type):
+    _toSchema = {'application_name': 'application-name', 'application_url': 'application-url', 'endpoints': 'endpoints', 'err': 'err', 'life': 'life', 'relations': 'relations', 'status': 'status'}
+    _toPy = {'application-name': 'application_name', 'application-url': 'application_url', 'endpoints': 'endpoints', 'err': 'err', 'life': 'life', 'relations': 'relations', 'status': 'status'}
+    def __init__(self, application_name=None, application_url=None, endpoints=None, err=None, life=None, relations=None, status=None):
+        '''
+        application_name : str
+        application_url : str
+        endpoints : typing.Sequence<+T_co>[~RemoteEndpoint]<~RemoteEndpoint>
+        err : typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        life : str
+        relations : typing.Sequence<+T_co>[str]
+        status : DetailedStatus
+        '''
+        self.application_name = application_name
+        self.application_url = application_url
+        self.endpoints = [RemoteEndpoint.from_json(o) for o in endpoints or []]
+        self.err = err
+        self.life = life
+        self.relations = relations
+        self.status = DetailedStatus.from_json(status) if status else None
+
+
+class RemoteEndpoint(Type):
+    _toSchema = {'interface': 'interface', 'limit': 'limit', 'name': 'name', 'role': 'role', 'scope': 'scope'}
+    _toPy = {'interface': 'interface', 'limit': 'limit', 'name': 'name', 'role': 'role', 'scope': 'scope'}
+    def __init__(self, interface=None, limit=None, name=None, role=None, scope=None):
+        '''
+        interface : str
+        limit : int
+        name : str
+        role : str
+        scope : str
+        '''
+        self.interface = interface
+        self.limit = limit
+        self.name = name
+        self.role = role
+        self.scope = scope
+
+
 class ResolveCharmResult(Type):
-    _toSchema = {'error': 'Error', 'url': 'URL'}
-    _toPy = {'URL': 'url', 'Error': 'error'}
+    _toSchema = {'error': 'error', 'url': 'url'}
+    _toPy = {'error': 'error', 'url': 'url'}
     def __init__(self, error=None, url=None):
         '''
         error : str
-        url : URL
+        url : str
         '''
         self.error = error
-        self.url = URL.from_json(url) if url else None
+        self.url = url
 
 
 class ResolveCharmResults(Type):
-    _toSchema = {'urls': 'URLs'}
-    _toPy = {'URLs': 'urls'}
+    _toSchema = {'urls': 'urls'}
+    _toPy = {'urls': 'urls'}
     def __init__(self, urls=None):
         '''
-        urls : typing.Sequence[~ResolveCharmResult]
+        urls : typing.Sequence<+T_co>[~ResolveCharmResult]<~ResolveCharmResult>
         '''
         self.urls = [ResolveCharmResult.from_json(o) for o in urls or []]
 
 
 class ResolveCharms(Type):
-    _toSchema = {'references': 'References'}
-    _toPy = {'References': 'references'}
+    _toSchema = {'references': 'references'}
+    _toPy = {'references': 'references'}
     def __init__(self, references=None):
         '''
-        references : typing.Sequence[~URL]
+        references : typing.Sequence<+T_co>[str]
         '''
-        self.references = [URL.from_json(o) for o in references or []]
+        self.references = references
 
 
 class Resolved(Type):
-    _toSchema = {'unitname': 'UnitName', 'retry': 'Retry'}
-    _toPy = {'UnitName': 'unitname', 'Retry': 'retry'}
-    def __init__(self, retry=None, unitname=None):
+    _toSchema = {'retry': 'retry', 'unit_name': 'unit-name'}
+    _toPy = {'retry': 'retry', 'unit-name': 'unit_name'}
+    def __init__(self, retry=None, unit_name=None):
         '''
         retry : bool
-        unitname : str
+        unit_name : str
         '''
         self.retry = retry
-        self.unitname = unitname
+        self.unit_name = unit_name
 
 
 class SetModelAgentVersion(Type):
-    _toSchema = {'minor': 'Minor', 'major': 'Major', 'patch': 'Patch', 'tag': 'Tag', 'build': 'Build'}
-    _toPy = {'Patch': 'patch', 'Major': 'major', 'Minor': 'minor', 'Tag': 'tag', 'Build': 'build'}
-    def __init__(self, build=None, major=None, minor=None, patch=None, tag=None):
+    _toSchema = {'version': 'version'}
+    _toPy = {'version': 'version'}
+    def __init__(self, version=None):
         '''
-        build : int
-        major : int
-        minor : int
-        patch : int
-        tag : str
+        version : Number
         '''
-        self.build = build
-        self.major = major
-        self.minor = minor
-        self.patch = patch
-        self.tag = tag
+        self.version = Number.from_json(version) if version else None
 
 
 class StatusHistoryFilter(Type):
-    _toSchema = {'delta': 'Delta', 'date': 'Date', 'size': 'Size'}
-    _toPy = {'Delta': 'delta', 'Date': 'date', 'Size': 'size'}
+    _toSchema = {'date': 'date', 'delta': 'delta', 'size': 'size'}
+    _toPy = {'date': 'date', 'delta': 'delta', 'size': 'size'}
     def __init__(self, date=None, delta=None, size=None):
         '''
         date : str
@@ -1819,8 +2193,8 @@ class StatusHistoryFilter(Type):
 
 
 class StatusHistoryRequest(Type):
-    _toSchema = {'historykind': 'HistoryKind', 'filter_': 'Filter', 'tag': 'Tag', 'size': 'Size'}
-    _toPy = {'Tag': 'tag', 'Size': 'size', 'Filter': 'filter_', 'HistoryKind': 'historykind'}
+    _toSchema = {'filter_': 'filter', 'historykind': 'historyKind', 'size': 'size', 'tag': 'tag'}
+    _toPy = {'filter': 'filter_', 'historyKind': 'historykind', 'size': 'size', 'tag': 'tag'}
     def __init__(self, filter_=None, historykind=None, size=None, tag=None):
         '''
         filter_ : StatusHistoryFilter
@@ -1835,18 +2209,18 @@ class StatusHistoryRequest(Type):
 
 
 class StatusHistoryRequests(Type):
-    _toSchema = {'requests': 'Requests'}
-    _toPy = {'Requests': 'requests'}
+    _toSchema = {'requests': 'requests'}
+    _toPy = {'requests': 'requests'}
     def __init__(self, requests=None):
         '''
-        requests : typing.Sequence[~StatusHistoryRequest]
+        requests : typing.Sequence<+T_co>[~StatusHistoryRequest]<~StatusHistoryRequest>
         '''
         self.requests = [StatusHistoryRequest.from_json(o) for o in requests or []]
 
 
 class StatusHistoryResult(Type):
-    _toSchema = {'history': 'History', 'error': 'Error'}
-    _toPy = {'History': 'history', 'Error': 'error'}
+    _toSchema = {'error': 'error', 'history': 'history'}
+    _toPy = {'error': 'error', 'history': 'history'}
     def __init__(self, error=None, history=None):
         '''
         error : Error
@@ -1857,28 +2231,28 @@ class StatusHistoryResult(Type):
 
 
 class StatusHistoryResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~StatusHistoryResult]
+        results : typing.Sequence<+T_co>[~StatusHistoryResult]<~StatusHistoryResult>
         '''
         self.results = [StatusHistoryResult.from_json(o) for o in results or []]
 
 
 class StatusParams(Type):
-    _toSchema = {'patterns': 'Patterns'}
-    _toPy = {'Patterns': 'patterns'}
+    _toSchema = {'patterns': 'patterns'}
+    _toPy = {'patterns': 'patterns'}
     def __init__(self, patterns=None):
         '''
-        patterns : typing.Sequence[str]
+        patterns : typing.Sequence<+T_co>[str]
         '''
         self.patterns = patterns
 
 
 class Tools(Type):
-    _toSchema = {'sha256': 'sha256', 'url': 'url', 'size': 'size', 'version': 'version'}
-    _toPy = {'sha256': 'sha256', 'url': 'url', 'size': 'size', 'version': 'version'}
+    _toSchema = {'sha256': 'sha256', 'size': 'size', 'url': 'url', 'version': 'version'}
+    _toPy = {'sha256': 'sha256', 'size': 'size', 'url': 'url', 'version': 'version'}
     def __init__(self, sha256=None, size=None, url=None, version=None):
         '''
         sha256 : str
@@ -1892,46 +2266,186 @@ class Tools(Type):
         self.version = Binary.from_json(version) if version else None
 
 
-class URL(Type):
-    _toSchema = {'revision': 'Revision', 'series': 'Series', 'schema': 'Schema', 'channel': 'Channel', 'name': 'Name', 'user': 'User'}
-    _toPy = {'Name': 'name', 'Revision': 'revision', 'User': 'user', 'Schema': 'schema', 'Channel': 'channel', 'Series': 'series'}
-    def __init__(self, channel=None, name=None, revision=None, schema=None, series=None, user=None):
+class UnitStatus(Type):
+    _toSchema = {'agent_status': 'agent-status', 'charm': 'charm', 'leader': 'leader', 'machine': 'machine', 'opened_ports': 'opened-ports', 'public_address': 'public-address', 'subordinates': 'subordinates', 'workload_status': 'workload-status', 'workload_version': 'workload-version'}
+    _toPy = {'agent-status': 'agent_status', 'charm': 'charm', 'leader': 'leader', 'machine': 'machine', 'opened-ports': 'opened_ports', 'public-address': 'public_address', 'subordinates': 'subordinates', 'workload-status': 'workload_status', 'workload-version': 'workload_version'}
+    def __init__(self, agent_status=None, charm=None, leader=None, machine=None, opened_ports=None, public_address=None, subordinates=None, workload_status=None, workload_version=None):
         '''
-        channel : str
+        agent_status : DetailedStatus
+        charm : str
+        leader : bool
+        machine : str
+        opened_ports : typing.Sequence<+T_co>[str]
+        public_address : str
+        subordinates : typing.Mapping<~KT, +VT_co>[str, ~UnitStatus]<~UnitStatus>
+        workload_status : DetailedStatus
+        workload_version : str
+        '''
+        self.agent_status = DetailedStatus.from_json(agent_status) if agent_status else None
+        self.charm = charm
+        self.leader = leader
+        self.machine = machine
+        self.opened_ports = opened_ports
+        self.public_address = public_address
+        self.subordinates = subordinates
+        self.workload_status = DetailedStatus.from_json(workload_status) if workload_status else None
+        self.workload_version = workload_version
+
+
+class Cloud(Type):
+    _toSchema = {'auth_types': 'auth-types', 'endpoint': 'endpoint', 'identity_endpoint': 'identity-endpoint', 'regions': 'regions', 'storage_endpoint': 'storage-endpoint', 'type_': 'type'}
+    _toPy = {'auth-types': 'auth_types', 'endpoint': 'endpoint', 'identity-endpoint': 'identity_endpoint', 'regions': 'regions', 'storage-endpoint': 'storage_endpoint', 'type': 'type_'}
+    def __init__(self, auth_types=None, endpoint=None, identity_endpoint=None, regions=None, storage_endpoint=None, type_=None):
+        '''
+        auth_types : typing.Sequence<+T_co>[str]
+        endpoint : str
+        identity_endpoint : str
+        regions : typing.Sequence<+T_co>[~CloudRegion]<~CloudRegion>
+        storage_endpoint : str
+        type_ : str
+        '''
+        self.auth_types = auth_types
+        self.endpoint = endpoint
+        self.identity_endpoint = identity_endpoint
+        self.regions = [CloudRegion.from_json(o) for o in regions or []]
+        self.storage_endpoint = storage_endpoint
+        self.type_ = type_
+
+
+class CloudCredentialResult(Type):
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
+    def __init__(self, error=None, result=None):
+        '''
+        error : Error
+        result : CloudCredential
+        '''
+        self.error = Error.from_json(error) if error else None
+        self.result = CloudCredential.from_json(result) if result else None
+
+
+class CloudCredentialResults(Type):
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
+    def __init__(self, results=None):
+        '''
+        results : typing.Sequence<+T_co>[~CloudCredentialResult]<~CloudCredentialResult>
+        '''
+        self.results = [CloudCredentialResult.from_json(o) for o in results or []]
+
+
+class CloudRegion(Type):
+    _toSchema = {'endpoint': 'endpoint', 'identity_endpoint': 'identity-endpoint', 'name': 'name', 'storage_endpoint': 'storage-endpoint'}
+    _toPy = {'endpoint': 'endpoint', 'identity-endpoint': 'identity_endpoint', 'name': 'name', 'storage-endpoint': 'storage_endpoint'}
+    def __init__(self, endpoint=None, identity_endpoint=None, name=None, storage_endpoint=None):
+        '''
+        endpoint : str
+        identity_endpoint : str
         name : str
-        revision : int
-        schema : str
-        series : str
-        user : str
+        storage_endpoint : str
         '''
-        self.channel = channel
+        self.endpoint = endpoint
+        self.identity_endpoint = identity_endpoint
         self.name = name
-        self.revision = revision
-        self.schema = schema
-        self.series = series
-        self.user = user
+        self.storage_endpoint = storage_endpoint
 
 
-class UnitStatus(Type):
-    _toSchema = {'charm': 'Charm', 'publicaddress': 'PublicAddress', 'openedports': 'OpenedPorts', 'agentstatus': 'AgentStatus', 'subordinates': 'Subordinates', 'workloadstatus': 'WorkloadStatus', 'machine': 'Machine'}
-    _toPy = {'AgentStatus': 'agentstatus', 'Charm': 'charm', 'OpenedPorts': 'openedports', 'WorkloadStatus': 'workloadstatus', 'PublicAddress': 'publicaddress', 'Machine': 'machine', 'Subordinates': 'subordinates'}
-    def __init__(self, agentstatus=None, charm=None, machine=None, openedports=None, publicaddress=None, subordinates=None, workloadstatus=None):
+class CloudResult(Type):
+    _toSchema = {'cloud': 'cloud', 'error': 'error'}
+    _toPy = {'cloud': 'cloud', 'error': 'error'}
+    def __init__(self, cloud=None, error=None):
         '''
-        agentstatus : DetailedStatus
-        charm : str
-        machine : str
-        openedports : typing.Sequence[str]
-        publicaddress : str
-        subordinates : typing.Mapping[str, ~UnitStatus]
-        workloadstatus : DetailedStatus
+        cloud : Cloud
+        error : Error
         '''
-        self.agentstatus = DetailedStatus.from_json(agentstatus) if agentstatus else None
-        self.charm = charm
-        self.machine = machine
-        self.openedports = openedports
-        self.publicaddress = publicaddress
-        self.subordinates = {k: UnitStatus.from_json(v) for k, v in (subordinates or dict()).items()}
-        self.workloadstatus = DetailedStatus.from_json(workloadstatus) if workloadstatus else None
+        self.cloud = Cloud.from_json(cloud) if cloud else None
+        self.error = Error.from_json(error) if error else None
+
+
+class CloudResults(Type):
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
+    def __init__(self, results=None):
+        '''
+        results : typing.Sequence<+T_co>[~CloudResult]<~CloudResult>
+        '''
+        self.results = [CloudResult.from_json(o) for o in results or []]
+
+
+class CloudsResult(Type):
+    _toSchema = {'clouds': 'clouds'}
+    _toPy = {'clouds': 'clouds'}
+    def __init__(self, clouds=None):
+        '''
+        clouds : typing.Mapping<~KT, +VT_co>[str, ~Cloud]<~Cloud>
+        '''
+        self.clouds = clouds
+
+
+class StringsResult(Type):
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
+    def __init__(self, error=None, result=None):
+        '''
+        error : Error
+        result : typing.Sequence<+T_co>[str]
+        '''
+        self.error = Error.from_json(error) if error else None
+        self.result = result
+
+
+class StringsResults(Type):
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
+    def __init__(self, results=None):
+        '''
+        results : typing.Sequence<+T_co>[~StringsResult]<~StringsResult>
+        '''
+        self.results = [StringsResult.from_json(o) for o in results or []]
+
+
+class UpdateCloudCredential(Type):
+    _toSchema = {'credential': 'credential', 'tag': 'tag'}
+    _toPy = {'credential': 'credential', 'tag': 'tag'}
+    def __init__(self, credential=None, tag=None):
+        '''
+        credential : CloudCredential
+        tag : str
+        '''
+        self.credential = CloudCredential.from_json(credential) if credential else None
+        self.tag = tag
+
+
+class UpdateCloudCredentials(Type):
+    _toSchema = {'credentials': 'credentials'}
+    _toPy = {'credentials': 'credentials'}
+    def __init__(self, credentials=None):
+        '''
+        credentials : typing.Sequence<+T_co>[~UpdateCloudCredential]<~UpdateCloudCredential>
+        '''
+        self.credentials = [UpdateCloudCredential.from_json(o) for o in credentials or []]
+
+
+class UserCloud(Type):
+    _toSchema = {'cloud_tag': 'cloud-tag', 'user_tag': 'user-tag'}
+    _toPy = {'cloud-tag': 'cloud_tag', 'user-tag': 'user_tag'}
+    def __init__(self, cloud_tag=None, user_tag=None):
+        '''
+        cloud_tag : str
+        user_tag : str
+        '''
+        self.cloud_tag = cloud_tag
+        self.user_tag = user_tag
+
+
+class UserClouds(Type):
+    _toSchema = {'user_clouds': 'user-clouds'}
+    _toPy = {'user-clouds': 'user_clouds'}
+    def __init__(self, user_clouds=None):
+        '''
+        user_clouds : typing.Sequence<+T_co>[~UserCloud]<~UserCloud>
+        '''
+        self.user_clouds = [UserCloud.from_json(o) for o in user_clouds or []]
 
 
 class DestroyControllerArgs(Type):
@@ -1944,60 +2458,124 @@ class DestroyControllerArgs(Type):
         self.destroy_models = destroy_models
 
 
-class InitiateModelMigrationArgs(Type):
+class HostedModelConfig(Type):
+    _toSchema = {'cloud_spec': 'cloud-spec', 'config': 'config', 'error': 'error', 'name': 'name', 'owner': 'owner'}
+    _toPy = {'cloud-spec': 'cloud_spec', 'config': 'config', 'error': 'error', 'name': 'name', 'owner': 'owner'}
+    def __init__(self, cloud_spec=None, config=None, error=None, name=None, owner=None):
+        '''
+        cloud_spec : CloudSpec
+        config : typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        error : Error
+        name : str
+        owner : str
+        '''
+        self.cloud_spec = CloudSpec.from_json(cloud_spec) if cloud_spec else None
+        self.config = config
+        self.error = Error.from_json(error) if error else None
+        self.name = name
+        self.owner = owner
+
+
+class HostedModelConfigsResults(Type):
+    _toSchema = {'models': 'models'}
+    _toPy = {'models': 'models'}
+    def __init__(self, models=None):
+        '''
+        models : typing.Sequence<+T_co>[~HostedModelConfig]<~HostedModelConfig>
+        '''
+        self.models = [HostedModelConfig.from_json(o) for o in models or []]
+
+
+class InitiateMigrationArgs(Type):
     _toSchema = {'specs': 'specs'}
     _toPy = {'specs': 'specs'}
     def __init__(self, specs=None):
         '''
-        specs : typing.Sequence[~ModelMigrationSpec]
+        specs : typing.Sequence<+T_co>[~MigrationSpec]<~MigrationSpec>
         '''
-        self.specs = [ModelMigrationSpec.from_json(o) for o in specs or []]
+        self.specs = [MigrationSpec.from_json(o) for o in specs or []]
 
 
-class InitiateModelMigrationResult(Type):
-    _toSchema = {'id_': 'id', 'model_tag': 'model-tag', 'error': 'error'}
-    _toPy = {'id': 'id_', 'error': 'error', 'model-tag': 'model_tag'}
-    def __init__(self, error=None, id_=None, model_tag=None):
+class InitiateMigrationResult(Type):
+    _toSchema = {'error': 'error', 'migration_id': 'migration-id', 'model_tag': 'model-tag'}
+    _toPy = {'error': 'error', 'migration-id': 'migration_id', 'model-tag': 'model_tag'}
+    def __init__(self, error=None, migration_id=None, model_tag=None):
         '''
         error : Error
-        id_ : str
+        migration_id : str
         model_tag : str
         '''
         self.error = Error.from_json(error) if error else None
-        self.id_ = id_
+        self.migration_id = migration_id
         self.model_tag = model_tag
 
 
-class InitiateModelMigrationResults(Type):
+class InitiateMigrationResults(Type):
     _toSchema = {'results': 'results'}
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~InitiateModelMigrationResult]
+        results : typing.Sequence<+T_co>[~InitiateMigrationResult]<~InitiateMigrationResult>
+        '''
+        self.results = [InitiateMigrationResult.from_json(o) for o in results or []]
+
+
+class MigrationSpec(Type):
+    _toSchema = {'external_control': 'external-control', 'model_tag': 'model-tag', 'skip_initial_prechecks': 'skip-initial-prechecks', 'target_info': 'target-info'}
+    _toPy = {'external-control': 'external_control', 'model-tag': 'model_tag', 'skip-initial-prechecks': 'skip_initial_prechecks', 'target-info': 'target_info'}
+    def __init__(self, external_control=None, model_tag=None, skip_initial_prechecks=None, target_info=None):
+        '''
+        external_control : bool
+        model_tag : str
+        skip_initial_prechecks : bool
+        target_info : MigrationTargetInfo
+        '''
+        self.external_control = external_control
+        self.model_tag = model_tag
+        self.skip_initial_prechecks = skip_initial_prechecks
+        self.target_info = MigrationTargetInfo.from_json(target_info) if target_info else None
+
+
+class MigrationTargetInfo(Type):
+    _toSchema = {'addrs': 'addrs', 'auth_tag': 'auth-tag', 'ca_cert': 'ca-cert', 'controller_tag': 'controller-tag', 'macaroons': 'macaroons', 'password': 'password'}
+    _toPy = {'addrs': 'addrs', 'auth-tag': 'auth_tag', 'ca-cert': 'ca_cert', 'controller-tag': 'controller_tag', 'macaroons': 'macaroons', 'password': 'password'}
+    def __init__(self, addrs=None, auth_tag=None, ca_cert=None, controller_tag=None, macaroons=None, password=None):
+        '''
+        addrs : typing.Sequence<+T_co>[str]
+        auth_tag : str
+        ca_cert : str
+        controller_tag : str
+        macaroons : str
+        password : str
         '''
-        self.results = [InitiateModelMigrationResult.from_json(o) for o in results or []]
+        self.addrs = addrs
+        self.auth_tag = auth_tag
+        self.ca_cert = ca_cert
+        self.controller_tag = controller_tag
+        self.macaroons = macaroons
+        self.password = password
 
 
 class Model(Type):
-    _toSchema = {'uuid': 'UUID', 'ownertag': 'OwnerTag', 'name': 'Name'}
-    _toPy = {'OwnerTag': 'ownertag', 'Name': 'name', 'UUID': 'uuid'}
-    def __init__(self, name=None, ownertag=None, uuid=None):
+    _toSchema = {'name': 'name', 'owner_tag': 'owner-tag', 'uuid': 'uuid'}
+    _toPy = {'name': 'name', 'owner-tag': 'owner_tag', 'uuid': 'uuid'}
+    def __init__(self, name=None, owner_tag=None, uuid=None):
         '''
         name : str
-        ownertag : str
+        owner_tag : str
         uuid : str
         '''
         self.name = name
-        self.ownertag = ownertag
+        self.owner_tag = owner_tag
         self.uuid = uuid
 
 
 class ModelBlockInfo(Type):
-    _toSchema = {'blocks': 'blocks', 'model_uuid': 'model-uuid', 'owner_tag': 'owner-tag', 'name': 'name'}
-    _toPy = {'owner-tag': 'owner_tag', 'blocks': 'blocks', 'model-uuid': 'model_uuid', 'name': 'name'}
+    _toSchema = {'blocks': 'blocks', 'model_uuid': 'model-uuid', 'name': 'name', 'owner_tag': 'owner-tag'}
+    _toPy = {'blocks': 'blocks', 'model-uuid': 'model_uuid', 'name': 'name', 'owner-tag': 'owner_tag'}
     def __init__(self, blocks=None, model_uuid=None, name=None, owner_tag=None):
         '''
-        blocks : typing.Sequence[str]
+        blocks : typing.Sequence<+T_co>[str]
         model_uuid : str
         name : str
         owner_tag : str
@@ -2013,55 +2591,27 @@ class ModelBlockInfoList(Type):
     _toPy = {'models': 'models'}
     def __init__(self, models=None):
         '''
-        models : typing.Sequence[~ModelBlockInfo]
+        models : typing.Sequence<+T_co>[~ModelBlockInfo]<~ModelBlockInfo>
         '''
         self.models = [ModelBlockInfo.from_json(o) for o in models or []]
 
 
-class ModelMigrationSpec(Type):
-    _toSchema = {'model_tag': 'model-tag', 'target_info': 'target-info'}
-    _toPy = {'model-tag': 'model_tag', 'target-info': 'target_info'}
-    def __init__(self, model_tag=None, target_info=None):
-        '''
-        model_tag : str
-        target_info : ModelMigrationTargetInfo
-        '''
-        self.model_tag = model_tag
-        self.target_info = ModelMigrationTargetInfo.from_json(target_info) if target_info else None
-
-
-class ModelMigrationTargetInfo(Type):
-    _toSchema = {'auth_tag': 'auth-tag', 'ca_cert': 'ca-cert', 'controller_tag': 'controller-tag', 'password': 'password', 'addrs': 'addrs'}
-    _toPy = {'ca-cert': 'ca_cert', 'auth-tag': 'auth_tag', 'password': 'password', 'controller-tag': 'controller_tag', 'addrs': 'addrs'}
-    def __init__(self, addrs=None, auth_tag=None, ca_cert=None, controller_tag=None, password=None):
-        '''
-        addrs : typing.Sequence[str]
-        auth_tag : str
-        ca_cert : str
-        controller_tag : str
-        password : str
-        '''
-        self.addrs = addrs
-        self.auth_tag = auth_tag
-        self.ca_cert = ca_cert
-        self.controller_tag = controller_tag
-        self.password = password
-
-
 class ModelStatus(Type):
-    _toSchema = {'model_tag': 'model-tag', 'life': 'life', 'application_count': 'application-count', 'hosted_machine_count': 'hosted-machine-count', 'owner_tag': 'owner-tag'}
-    _toPy = {'life': 'life', 'application-count': 'application_count', 'hosted-machine-count': 'hosted_machine_count', 'model-tag': 'model_tag', 'owner-tag': 'owner_tag'}
-    def __init__(self, application_count=None, hosted_machine_count=None, life=None, model_tag=None, owner_tag=None):
+    _toSchema = {'application_count': 'application-count', 'hosted_machine_count': 'hosted-machine-count', 'life': 'life', 'machines': 'machines', 'model_tag': 'model-tag', 'owner_tag': 'owner-tag'}
+    _toPy = {'application-count': 'application_count', 'hosted-machine-count': 'hosted_machine_count', 'life': 'life', 'machines': 'machines', 'model-tag': 'model_tag', 'owner-tag': 'owner_tag'}
+    def __init__(self, application_count=None, hosted_machine_count=None, life=None, machines=None, model_tag=None, owner_tag=None):
         '''
         application_count : int
         hosted_machine_count : int
         life : str
+        machines : typing.Sequence<+T_co>[~ModelMachineInfo]<~ModelMachineInfo>
         model_tag : str
         owner_tag : str
         '''
         self.application_count = application_count
         self.hosted_machine_count = hosted_machine_count
         self.life = life
+        self.machines = [ModelMachineInfo.from_json(o) for o in machines or []]
         self.model_tag = model_tag
         self.owner_tag = owner_tag
 
@@ -2071,11 +2621,35 @@ class ModelStatusResults(Type):
     _toPy = {'models': 'models'}
     def __init__(self, models=None):
         '''
-        models : typing.Sequence[~ModelStatus]
+        models : typing.Sequence<+T_co>[~ModelStatus]<~ModelStatus>
         '''
         self.models = [ModelStatus.from_json(o) for o in models or []]
 
 
+class ModifyControllerAccess(Type):
+    _toSchema = {'access': 'access', 'action': 'action', 'user_tag': 'user-tag'}
+    _toPy = {'access': 'access', 'action': 'action', 'user-tag': 'user_tag'}
+    def __init__(self, access=None, action=None, user_tag=None):
+        '''
+        access : str
+        action : str
+        user_tag : str
+        '''
+        self.access = access
+        self.action = action
+        self.user_tag = user_tag
+
+
+class ModifyControllerAccessRequest(Type):
+    _toSchema = {'changes': 'changes'}
+    _toPy = {'changes': 'changes'}
+    def __init__(self, changes=None):
+        '''
+        changes : typing.Sequence<+T_co>[~ModifyControllerAccess]<~ModifyControllerAccess>
+        '''
+        self.changes = [ModifyControllerAccess.from_json(o) for o in changes or []]
+
+
 class RemoveBlocksArgs(Type):
     _toSchema = {'all_': 'all'}
     _toPy = {'all': 'all_'}
@@ -2086,53 +2660,103 @@ class RemoveBlocksArgs(Type):
         self.all_ = all_
 
 
+class UserAccess(Type):
+    _toSchema = {'access': 'access', 'user_tag': 'user-tag'}
+    _toPy = {'access': 'access', 'user-tag': 'user_tag'}
+    def __init__(self, access=None, user_tag=None):
+        '''
+        access : str
+        user_tag : str
+        '''
+        self.access = access
+        self.user_tag = user_tag
+
+
+class UserAccessResult(Type):
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
+    def __init__(self, error=None, result=None):
+        '''
+        error : Error
+        result : UserAccess
+        '''
+        self.error = Error.from_json(error) if error else None
+        self.result = UserAccess.from_json(result) if result else None
+
+
+class UserAccessResults(Type):
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
+    def __init__(self, results=None):
+        '''
+        results : typing.Sequence<+T_co>[~UserAccessResult]<~UserAccessResult>
+        '''
+        self.results = [UserAccessResult.from_json(o) for o in results or []]
+
+
 class UserModel(Type):
-    _toSchema = {'model': 'Model', 'lastconnection': 'LastConnection'}
-    _toPy = {'Model': 'model', 'LastConnection': 'lastconnection'}
-    def __init__(self, lastconnection=None, model=None):
+    _toSchema = {'last_connection': 'last-connection', 'model': 'model'}
+    _toPy = {'last-connection': 'last_connection', 'model': 'model'}
+    def __init__(self, last_connection=None, model=None):
         '''
-        lastconnection : str
+        last_connection : str
         model : Model
         '''
-        self.lastconnection = lastconnection
+        self.last_connection = last_connection
         self.model = Model.from_json(model) if model else None
 
 
 class UserModelList(Type):
-    _toSchema = {'usermodels': 'UserModels'}
-    _toPy = {'UserModels': 'usermodels'}
-    def __init__(self, usermodels=None):
+    _toSchema = {'user_models': 'user-models'}
+    _toPy = {'user-models': 'user_models'}
+    def __init__(self, user_models=None):
         '''
-        usermodels : typing.Sequence[~UserModel]
+        user_models : typing.Sequence<+T_co>[~UserModel]<~UserModel>
         '''
-        self.usermodels = [UserModel.from_json(o) for o in usermodels or []]
+        self.user_models = [UserModel.from_json(o) for o in user_models or []]
 
 
 class BytesResult(Type):
-    _toSchema = {'result': 'Result'}
-    _toPy = {'Result': 'result'}
+    _toSchema = {'result': 'result'}
+    _toPy = {'result': 'result'}
     def __init__(self, result=None):
         '''
-        result : typing.Sequence[int]
+        result : typing.Sequence<+T_co>[int]
         '''
         self.result = result
 
 
 class DeployerConnectionValues(Type):
-    _toSchema = {'stateaddresses': 'StateAddresses', 'apiaddresses': 'APIAddresses'}
-    _toPy = {'StateAddresses': 'stateaddresses', 'APIAddresses': 'apiaddresses'}
-    def __init__(self, apiaddresses=None, stateaddresses=None):
+    _toSchema = {'api_addresses': 'api-addresses', 'state_addresses': 'state-addresses'}
+    _toPy = {'api-addresses': 'api_addresses', 'state-addresses': 'state_addresses'}
+    def __init__(self, api_addresses=None, state_addresses=None):
         '''
-        apiaddresses : typing.Sequence[str]
-        stateaddresses : typing.Sequence[str]
+        api_addresses : typing.Sequence<+T_co>[str]
+        state_addresses : typing.Sequence<+T_co>[str]
+        '''
+        self.api_addresses = api_addresses
+        self.state_addresses = state_addresses
+
+
+class EntityStatusArgs(Type):
+    _toSchema = {'data': 'data', 'info': 'info', 'status': 'status', 'tag': 'tag'}
+    _toPy = {'data': 'data', 'info': 'info', 'status': 'status', 'tag': 'tag'}
+    def __init__(self, data=None, info=None, status=None, tag=None):
+        '''
+        data : typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        info : str
+        status : str
+        tag : str
         '''
-        self.apiaddresses = apiaddresses
-        self.stateaddresses = stateaddresses
+        self.data = data
+        self.info = info
+        self.status = status
+        self.tag = tag
 
 
 class LifeResult(Type):
-    _toSchema = {'life': 'Life', 'error': 'Error'}
-    _toPy = {'Life': 'life', 'Error': 'error'}
+    _toSchema = {'error': 'error', 'life': 'life'}
+    _toPy = {'error': 'error', 'life': 'life'}
     def __init__(self, error=None, life=None):
         '''
         error : Error
@@ -2143,170 +2767,164 @@ class LifeResult(Type):
 
 
 class LifeResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~LifeResult]
+        results : typing.Sequence<+T_co>[~LifeResult]<~LifeResult>
         '''
         self.results = [LifeResult.from_json(o) for o in results or []]
 
 
-class StringsResult(Type):
-    _toSchema = {'result': 'Result', 'error': 'Error'}
-    _toPy = {'Result': 'result', 'Error': 'error'}
-    def __init__(self, error=None, result=None):
+class SetStatus(Type):
+    _toSchema = {'entities': 'entities'}
+    _toPy = {'entities': 'entities'}
+    def __init__(self, entities=None):
         '''
-        error : Error
-        result : typing.Sequence[str]
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
         '''
-        self.error = Error.from_json(error) if error else None
-        self.result = result
+        self.entities = [EntityStatusArgs.from_json(o) for o in entities or []]
 
 
 class StringsWatchResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~StringsWatchResult]
+        results : typing.Sequence<+T_co>[~StringsWatchResult]<~StringsWatchResult>
         '''
         self.results = [StringsWatchResult.from_json(o) for o in results or []]
 
 
 class AddSubnetParams(Type):
-    _toSchema = {'subnetproviderid': 'SubnetProviderId', 'spacetag': 'SpaceTag', 'subnettag': 'SubnetTag', 'zones': 'Zones'}
-    _toPy = {'SubnetTag': 'subnettag', 'SpaceTag': 'spacetag', 'Zones': 'zones', 'SubnetProviderId': 'subnetproviderid'}
-    def __init__(self, spacetag=None, subnetproviderid=None, subnettag=None, zones=None):
-        '''
-        spacetag : str
-        subnetproviderid : str
-        subnettag : str
-        zones : typing.Sequence[str]
-        '''
-        self.spacetag = spacetag
-        self.subnetproviderid = subnetproviderid
-        self.subnettag = subnettag
+    _toSchema = {'space_tag': 'space-tag', 'subnet_provider_id': 'subnet-provider-id', 'subnet_tag': 'subnet-tag', 'zones': 'zones'}
+    _toPy = {'space-tag': 'space_tag', 'subnet-provider-id': 'subnet_provider_id', 'subnet-tag': 'subnet_tag', 'zones': 'zones'}
+    def __init__(self, space_tag=None, subnet_provider_id=None, subnet_tag=None, zones=None):
+        '''
+        space_tag : str
+        subnet_provider_id : str
+        subnet_tag : str
+        zones : typing.Sequence<+T_co>[str]
+        '''
+        self.space_tag = space_tag
+        self.subnet_provider_id = subnet_provider_id
+        self.subnet_tag = subnet_tag
         self.zones = zones
 
 
 class AddSubnetsParams(Type):
-    _toSchema = {'subnets': 'Subnets'}
-    _toPy = {'Subnets': 'subnets'}
+    _toSchema = {'subnets': 'subnets'}
+    _toPy = {'subnets': 'subnets'}
     def __init__(self, subnets=None):
         '''
-        subnets : typing.Sequence[~AddSubnetParams]
+        subnets : typing.Sequence<+T_co>[~AddSubnetParams]<~AddSubnetParams>
         '''
         self.subnets = [AddSubnetParams.from_json(o) for o in subnets or []]
 
 
 class CreateSpaceParams(Type):
-    _toSchema = {'providerid': 'ProviderId', 'public': 'Public', 'spacetag': 'SpaceTag', 'subnettags': 'SubnetTags'}
-    _toPy = {'Public': 'public', 'SpaceTag': 'spacetag', 'SubnetTags': 'subnettags', 'ProviderId': 'providerid'}
-    def __init__(self, providerid=None, public=None, spacetag=None, subnettags=None):
+    _toSchema = {'provider_id': 'provider-id', 'public': 'public', 'space_tag': 'space-tag', 'subnet_tags': 'subnet-tags'}
+    _toPy = {'provider-id': 'provider_id', 'public': 'public', 'space-tag': 'space_tag', 'subnet-tags': 'subnet_tags'}
+    def __init__(self, provider_id=None, public=None, space_tag=None, subnet_tags=None):
         '''
-        providerid : str
+        provider_id : str
         public : bool
-        spacetag : str
-        subnettags : typing.Sequence[str]
+        space_tag : str
+        subnet_tags : typing.Sequence<+T_co>[str]
         '''
-        self.providerid = providerid
+        self.provider_id = provider_id
         self.public = public
-        self.spacetag = spacetag
-        self.subnettags = subnettags
+        self.space_tag = space_tag
+        self.subnet_tags = subnet_tags
 
 
 class CreateSpacesParams(Type):
-    _toSchema = {'spaces': 'Spaces'}
-    _toPy = {'Spaces': 'spaces'}
+    _toSchema = {'spaces': 'spaces'}
+    _toPy = {'spaces': 'spaces'}
     def __init__(self, spaces=None):
         '''
-        spaces : typing.Sequence[~CreateSpaceParams]
+        spaces : typing.Sequence<+T_co>[~CreateSpaceParams]<~CreateSpaceParams>
         '''
         self.spaces = [CreateSpaceParams.from_json(o) for o in spaces or []]
 
 
 class DiscoverSpacesResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ProviderSpace]
+        results : typing.Sequence<+T_co>[~ProviderSpace]<~ProviderSpace>
         '''
         self.results = [ProviderSpace.from_json(o) for o in results or []]
 
 
 class ListSubnetsResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~Subnet]
+        results : typing.Sequence<+T_co>[~Subnet]<~Subnet>
         '''
         self.results = [Subnet.from_json(o) for o in results or []]
 
 
 class ProviderSpace(Type):
-    _toSchema = {'providerid': 'ProviderId', 'subnets': 'Subnets', 'error': 'Error', 'name': 'Name'}
-    _toPy = {'ProviderId': 'providerid', 'Subnets': 'subnets', 'Error': 'error', 'Name': 'name'}
-    def __init__(self, error=None, name=None, providerid=None, subnets=None):
+    _toSchema = {'error': 'error', 'name': 'name', 'provider_id': 'provider-id', 'subnets': 'subnets'}
+    _toPy = {'error': 'error', 'name': 'name', 'provider-id': 'provider_id', 'subnets': 'subnets'}
+    def __init__(self, error=None, name=None, provider_id=None, subnets=None):
         '''
         error : Error
         name : str
-        providerid : str
-        subnets : typing.Sequence[~Subnet]
+        provider_id : str
+        subnets : typing.Sequence<+T_co>[~Subnet]<~Subnet>
         '''
         self.error = Error.from_json(error) if error else None
         self.name = name
-        self.providerid = providerid
+        self.provider_id = provider_id
         self.subnets = [Subnet.from_json(o) for o in subnets or []]
 
 
 class Subnet(Type):
-    _toSchema = {'staticrangelowip': 'StaticRangeLowIP', 'spacetag': 'SpaceTag', 'cidr': 'CIDR', 'providerid': 'ProviderId', 'life': 'Life', 'staticrangehighip': 'StaticRangeHighIP', 'zones': 'Zones', 'vlantag': 'VLANTag', 'status': 'Status'}
-    _toPy = {'StaticRangeHighIP': 'staticrangehighip', 'VLANTag': 'vlantag', 'Zones': 'zones', 'SpaceTag': 'spacetag', 'Life': 'life', 'Status': 'status', 'ProviderId': 'providerid', 'StaticRangeLowIP': 'staticrangelowip', 'CIDR': 'cidr'}
-    def __init__(self, cidr=None, life=None, providerid=None, spacetag=None, staticrangehighip=None, staticrangelowip=None, status=None, vlantag=None, zones=None):
+    _toSchema = {'cidr': 'cidr', 'life': 'life', 'provider_id': 'provider-id', 'space_tag': 'space-tag', 'status': 'status', 'vlan_tag': 'vlan-tag', 'zones': 'zones'}
+    _toPy = {'cidr': 'cidr', 'life': 'life', 'provider-id': 'provider_id', 'space-tag': 'space_tag', 'status': 'status', 'vlan-tag': 'vlan_tag', 'zones': 'zones'}
+    def __init__(self, cidr=None, life=None, provider_id=None, space_tag=None, status=None, vlan_tag=None, zones=None):
         '''
         cidr : str
         life : str
-        providerid : str
-        spacetag : str
-        staticrangehighip : typing.Sequence[int]
-        staticrangelowip : typing.Sequence[int]
+        provider_id : str
+        space_tag : str
         status : str
-        vlantag : int
-        zones : typing.Sequence[str]
+        vlan_tag : int
+        zones : typing.Sequence<+T_co>[str]
         '''
         self.cidr = cidr
         self.life = life
-        self.providerid = providerid
-        self.spacetag = spacetag
-        self.staticrangehighip = staticrangehighip
-        self.staticrangelowip = staticrangelowip
+        self.provider_id = provider_id
+        self.space_tag = space_tag
         self.status = status
-        self.vlantag = vlantag
+        self.vlan_tag = vlan_tag
         self.zones = zones
 
 
 class SubnetsFilters(Type):
-    _toSchema = {'spacetag': 'SpaceTag', 'zone': 'Zone'}
-    _toPy = {'SpaceTag': 'spacetag', 'Zone': 'zone'}
-    def __init__(self, spacetag=None, zone=None):
+    _toSchema = {'space_tag': 'space-tag', 'zone': 'zone'}
+    _toPy = {'space-tag': 'space_tag', 'zone': 'zone'}
+    def __init__(self, space_tag=None, zone=None):
         '''
-        spacetag : str
+        space_tag : str
         zone : str
         '''
-        self.spacetag = spacetag
+        self.space_tag = space_tag
         self.zone = zone
 
 
 class BlockDevice(Type):
-    _toSchema = {'inuse': 'InUse', 'busaddress': 'BusAddress', 'devicename': 'DeviceName', 'size': 'Size', 'filesystemtype': 'FilesystemType', 'uuid': 'UUID', 'hardwareid': 'HardwareId', 'label': 'Label', 'mountpoint': 'MountPoint', 'devicelinks': 'DeviceLinks'}
-    _toPy = {'FilesystemType': 'filesystemtype', 'Label': 'label', 'Size': 'size', 'UUID': 'uuid', 'MountPoint': 'mountpoint', 'BusAddress': 'busaddress', 'InUse': 'inuse', 'DeviceName': 'devicename', 'DeviceLinks': 'devicelinks', 'HardwareId': 'hardwareid'}
+    _toSchema = {'busaddress': 'BusAddress', 'devicelinks': 'DeviceLinks', 'devicename': 'DeviceName', 'filesystemtype': 'FilesystemType', 'hardwareid': 'HardwareId', 'inuse': 'InUse', 'label': 'Label', 'mountpoint': 'MountPoint', 'size': 'Size', 'uuid': 'UUID'}
+    _toPy = {'BusAddress': 'busaddress', 'DeviceLinks': 'devicelinks', 'DeviceName': 'devicename', 'FilesystemType': 'filesystemtype', 'HardwareId': 'hardwareid', 'InUse': 'inuse', 'Label': 'label', 'MountPoint': 'mountpoint', 'Size': 'size', 'UUID': 'uuid'}
     def __init__(self, busaddress=None, devicelinks=None, devicename=None, filesystemtype=None, hardwareid=None, inuse=None, label=None, mountpoint=None, size=None, uuid=None):
         '''
         busaddress : str
-        devicelinks : typing.Sequence[str]
+        devicelinks : typing.Sequence<+T_co>[str]
         devicename : str
         filesystemtype : str
         hardwareid : str
@@ -2329,168 +2947,174 @@ class BlockDevice(Type):
 
 
 class MachineBlockDevices(Type):
-    _toSchema = {'blockdevices': 'blockdevices', 'machine': 'machine'}
-    _toPy = {'blockdevices': 'blockdevices', 'machine': 'machine'}
-    def __init__(self, blockdevices=None, machine=None):
+    _toSchema = {'block_devices': 'block-devices', 'machine': 'machine'}
+    _toPy = {'block-devices': 'block_devices', 'machine': 'machine'}
+    def __init__(self, block_devices=None, machine=None):
         '''
-        blockdevices : typing.Sequence[~BlockDevice]
+        block_devices : typing.Sequence<+T_co>[~BlockDevice]<~BlockDevice>
         machine : str
         '''
-        self.blockdevices = [BlockDevice.from_json(o) for o in blockdevices or []]
+        self.block_devices = [BlockDevice.from_json(o) for o in block_devices or []]
         self.machine = machine
 
 
 class SetMachineBlockDevices(Type):
-    _toSchema = {'machineblockdevices': 'machineblockdevices'}
-    _toPy = {'machineblockdevices': 'machineblockdevices'}
-    def __init__(self, machineblockdevices=None):
+    _toSchema = {'machine_block_devices': 'machine-block-devices'}
+    _toPy = {'machine-block-devices': 'machine_block_devices'}
+    def __init__(self, machine_block_devices=None):
+        '''
+        machine_block_devices : typing.Sequence<+T_co>[~MachineBlockDevices]<~MachineBlockDevices>
+        '''
+        self.machine_block_devices = [MachineBlockDevices.from_json(o) for o in machine_block_devices or []]
+
+
+class EntitiesWatchResult(Type):
+    _toSchema = {'changes': 'changes', 'error': 'error', 'watcher_id': 'watcher-id'}
+    _toPy = {'changes': 'changes', 'error': 'error', 'watcher-id': 'watcher_id'}
+    def __init__(self, changes=None, error=None, watcher_id=None):
         '''
-        machineblockdevices : typing.Sequence[~MachineBlockDevices]
+        changes : typing.Sequence<+T_co>[str]
+        error : Error
+        watcher_id : str
         '''
-        self.machineblockdevices = [MachineBlockDevices.from_json(o) for o in machineblockdevices or []]
+        self.changes = changes
+        self.error = Error.from_json(error) if error else None
+        self.watcher_id = watcher_id
 
 
 class MachineStorageId(Type):
-    _toSchema = {'attachmenttag': 'attachmenttag', 'machinetag': 'machinetag'}
-    _toPy = {'attachmenttag': 'attachmenttag', 'machinetag': 'machinetag'}
-    def __init__(self, attachmenttag=None, machinetag=None):
+    _toSchema = {'attachment_tag': 'attachment-tag', 'machine_tag': 'machine-tag'}
+    _toPy = {'attachment-tag': 'attachment_tag', 'machine-tag': 'machine_tag'}
+    def __init__(self, attachment_tag=None, machine_tag=None):
         '''
-        attachmenttag : str
-        machinetag : str
+        attachment_tag : str
+        machine_tag : str
         '''
-        self.attachmenttag = attachmenttag
-        self.machinetag = machinetag
+        self.attachment_tag = attachment_tag
+        self.machine_tag = machine_tag
 
 
 class MachineStorageIdsWatchResult(Type):
-    _toSchema = {'changes': 'Changes', 'machinestorageidswatcherid': 'MachineStorageIdsWatcherId', 'error': 'Error'}
-    _toPy = {'Changes': 'changes', 'Error': 'error', 'MachineStorageIdsWatcherId': 'machinestorageidswatcherid'}
-    def __init__(self, changes=None, error=None, machinestorageidswatcherid=None):
+    _toSchema = {'changes': 'changes', 'error': 'error', 'watcher_id': 'watcher-id'}
+    _toPy = {'changes': 'changes', 'error': 'error', 'watcher-id': 'watcher_id'}
+    def __init__(self, changes=None, error=None, watcher_id=None):
         '''
-        changes : typing.Sequence[~MachineStorageId]
+        changes : typing.Sequence<+T_co>[~MachineStorageId]<~MachineStorageId>
         error : Error
-        machinestorageidswatcherid : str
+        watcher_id : str
         '''
         self.changes = [MachineStorageId.from_json(o) for o in changes or []]
         self.error = Error.from_json(error) if error else None
-        self.machinestorageidswatcherid = machinestorageidswatcherid
+        self.watcher_id = watcher_id
+
+
+class BoolResult(Type):
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
+    def __init__(self, error=None, result=None):
+        '''
+        error : Error
+        result : bool
+        '''
+        self.error = Error.from_json(error) if error else None
+        self.result = result
 
 
 class BoolResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~BoolResult]
+        results : typing.Sequence<+T_co>[~BoolResult]<~BoolResult>
         '''
         self.results = [BoolResult.from_json(o) for o in results or []]
 
 
 class MachinePortRange(Type):
-    _toSchema = {'unittag': 'UnitTag', 'portrange': 'PortRange', 'relationtag': 'RelationTag'}
-    _toPy = {'RelationTag': 'relationtag', 'UnitTag': 'unittag', 'PortRange': 'portrange'}
-    def __init__(self, portrange=None, relationtag=None, unittag=None):
+    _toSchema = {'port_range': 'port-range', 'relation_tag': 'relation-tag', 'unit_tag': 'unit-tag'}
+    _toPy = {'port-range': 'port_range', 'relation-tag': 'relation_tag', 'unit-tag': 'unit_tag'}
+    def __init__(self, port_range=None, relation_tag=None, unit_tag=None):
         '''
-        portrange : PortRange
-        relationtag : str
-        unittag : str
+        port_range : PortRange
+        relation_tag : str
+        unit_tag : str
         '''
-        self.portrange = PortRange.from_json(portrange) if portrange else None
-        self.relationtag = relationtag
-        self.unittag = unittag
+        self.port_range = PortRange.from_json(port_range) if port_range else None
+        self.relation_tag = relation_tag
+        self.unit_tag = unit_tag
 
 
 class MachinePorts(Type):
-    _toSchema = {'subnettag': 'SubnetTag', 'machinetag': 'MachineTag'}
-    _toPy = {'MachineTag': 'machinetag', 'SubnetTag': 'subnettag'}
-    def __init__(self, machinetag=None, subnettag=None):
+    _toSchema = {'machine_tag': 'machine-tag', 'subnet_tag': 'subnet-tag'}
+    _toPy = {'machine-tag': 'machine_tag', 'subnet-tag': 'subnet_tag'}
+    def __init__(self, machine_tag=None, subnet_tag=None):
         '''
-        machinetag : str
-        subnettag : str
+        machine_tag : str
+        subnet_tag : str
         '''
-        self.machinetag = machinetag
-        self.subnettag = subnettag
+        self.machine_tag = machine_tag
+        self.subnet_tag = subnet_tag
 
 
 class MachinePortsParams(Type):
-    _toSchema = {'params': 'Params'}
-    _toPy = {'Params': 'params'}
+    _toSchema = {'params': 'params'}
+    _toPy = {'params': 'params'}
     def __init__(self, params=None):
         '''
-        params : typing.Sequence[~MachinePorts]
+        params : typing.Sequence<+T_co>[~MachinePorts]<~MachinePorts>
         '''
         self.params = [MachinePorts.from_json(o) for o in params or []]
 
 
 class MachinePortsResult(Type):
-    _toSchema = {'ports': 'Ports', 'error': 'Error'}
-    _toPy = {'Error': 'error', 'Ports': 'ports'}
+    _toSchema = {'error': 'error', 'ports': 'ports'}
+    _toPy = {'error': 'error', 'ports': 'ports'}
     def __init__(self, error=None, ports=None):
         '''
         error : Error
-        ports : typing.Sequence[~MachinePortRange]
+        ports : typing.Sequence<+T_co>[~MachinePortRange]<~MachinePortRange>
         '''
         self.error = Error.from_json(error) if error else None
         self.ports = [MachinePortRange.from_json(o) for o in ports or []]
 
 
 class MachinePortsResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~MachinePortsResult]
+        results : typing.Sequence<+T_co>[~MachinePortsResult]<~MachinePortsResult>
         '''
         self.results = [MachinePortsResult.from_json(o) for o in results or []]
 
 
-class NotifyWatchResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
-    def __init__(self, results=None):
+class PortRange(Type):
+    _toSchema = {'from_port': 'from-port', 'protocol': 'protocol', 'to_port': 'to-port'}
+    _toPy = {'from-port': 'from_port', 'protocol': 'protocol', 'to-port': 'to_port'}
+    def __init__(self, from_port=None, protocol=None, to_port=None):
         '''
-        results : typing.Sequence[~NotifyWatchResult]
+        from_port : int
+        protocol : str
+        to_port : int
         '''
-        self.results = [NotifyWatchResult.from_json(o) for o in results or []]
-
-
-class PortRange(Type):
-    _toSchema = {'toport': 'ToPort', 'fromport': 'FromPort', 'protocol': 'Protocol'}
-    _toPy = {'FromPort': 'fromport', 'Protocol': 'protocol', 'ToPort': 'toport'}
-    def __init__(self, fromport=None, protocol=None, toport=None):
-        '''
-        fromport : int
-        protocol : str
-        toport : int
-        '''
-        self.fromport = fromport
+        self.from_port = from_port
         self.protocol = protocol
-        self.toport = toport
+        self.to_port = to_port
 
 
 class StringResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~StringResult]
+        results : typing.Sequence<+T_co>[~StringResult]<~StringResult>
         '''
         self.results = [StringResult.from_json(o) for o in results or []]
 
 
-class StringsResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
-    def __init__(self, results=None):
-        '''
-        results : typing.Sequence[~StringsResult]
-        '''
-        self.results = [StringsResult.from_json(o) for o in results or []]
-
-
 class ControllersChangeResult(Type):
-    _toSchema = {'result': 'Result', 'error': 'Error'}
-    _toPy = {'Result': 'result', 'Error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -2501,26 +3125,26 @@ class ControllersChangeResult(Type):
 
 
 class ControllersChangeResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ControllersChangeResult]
+        results : typing.Sequence<+T_co>[~ControllersChangeResult]<~ControllersChangeResult>
         '''
         self.results = [ControllersChangeResult.from_json(o) for o in results or []]
 
 
 class ControllersChanges(Type):
-    _toSchema = {'maintained': 'maintained', 'added': 'added', 'removed': 'removed', 'promoted': 'promoted', 'converted': 'converted', 'demoted': 'demoted'}
-    _toPy = {'maintained': 'maintained', 'added': 'added', 'removed': 'removed', 'promoted': 'promoted', 'converted': 'converted', 'demoted': 'demoted'}
+    _toSchema = {'added': 'added', 'converted': 'converted', 'demoted': 'demoted', 'maintained': 'maintained', 'promoted': 'promoted', 'removed': 'removed'}
+    _toPy = {'added': 'added', 'converted': 'converted', 'demoted': 'demoted', 'maintained': 'maintained', 'promoted': 'promoted', 'removed': 'removed'}
     def __init__(self, added=None, converted=None, demoted=None, maintained=None, promoted=None, removed=None):
         '''
-        added : typing.Sequence[str]
-        converted : typing.Sequence[str]
-        demoted : typing.Sequence[str]
-        maintained : typing.Sequence[str]
-        promoted : typing.Sequence[str]
-        removed : typing.Sequence[str]
+        added : typing.Sequence<+T_co>[str]
+        converted : typing.Sequence<+T_co>[str]
+        demoted : typing.Sequence<+T_co>[str]
+        maintained : typing.Sequence<+T_co>[str]
+        promoted : typing.Sequence<+T_co>[str]
+        removed : typing.Sequence<+T_co>[str]
         '''
         self.added = added
         self.converted = converted
@@ -2531,17 +3155,15 @@ class ControllersChanges(Type):
 
 
 class ControllersSpec(Type):
-    _toSchema = {'constraints': 'constraints', 'modeltag': 'ModelTag', 'num_controllers': 'num-controllers', 'placement': 'placement', 'series': 'series'}
-    _toPy = {'ModelTag': 'modeltag', 'series': 'series', 'num-controllers': 'num_controllers', 'placement': 'placement', 'constraints': 'constraints'}
-    def __init__(self, modeltag=None, constraints=None, num_controllers=None, placement=None, series=None):
+    _toSchema = {'constraints': 'constraints', 'num_controllers': 'num-controllers', 'placement': 'placement', 'series': 'series'}
+    _toPy = {'constraints': 'constraints', 'num-controllers': 'num_controllers', 'placement': 'placement', 'series': 'series'}
+    def __init__(self, constraints=None, num_controllers=None, placement=None, series=None):
         '''
-        modeltag : str
         constraints : Value
         num_controllers : int
-        placement : typing.Sequence[str]
+        placement : typing.Sequence<+T_co>[str]
         series : str
         '''
-        self.modeltag = modeltag
         self.constraints = Value.from_json(constraints) if constraints else None
         self.num_controllers = num_controllers
         self.placement = placement
@@ -2549,32 +3171,32 @@ class ControllersSpec(Type):
 
 
 class ControllersSpecs(Type):
-    _toSchema = {'specs': 'Specs'}
-    _toPy = {'Specs': 'specs'}
+    _toSchema = {'specs': 'specs'}
+    _toPy = {'specs': 'specs'}
     def __init__(self, specs=None):
         '''
-        specs : typing.Sequence[~ControllersSpec]
+        specs : typing.Sequence<+T_co>[~ControllersSpec]<~ControllersSpec>
         '''
         self.specs = [ControllersSpec.from_json(o) for o in specs or []]
 
 
 class HAMember(Type):
-    _toSchema = {'publicaddress': 'PublicAddress', 'series': 'Series', 'tag': 'Tag'}
-    _toPy = {'Tag': 'tag', 'PublicAddress': 'publicaddress', 'Series': 'series'}
-    def __init__(self, publicaddress=None, series=None, tag=None):
+    _toSchema = {'public_address': 'public-address', 'series': 'series', 'tag': 'tag'}
+    _toPy = {'public-address': 'public_address', 'series': 'series', 'tag': 'tag'}
+    def __init__(self, public_address=None, series=None, tag=None):
         '''
-        publicaddress : Address
+        public_address : Address
         series : str
         tag : str
         '''
-        self.publicaddress = Address.from_json(publicaddress) if publicaddress else None
+        self.public_address = Address.from_json(public_address) if public_address else None
         self.series = series
         self.tag = tag
 
 
 class Member(Type):
-    _toSchema = {'priority': 'Priority', 'slavedelay': 'SlaveDelay', 'id_': 'Id', 'hidden': 'Hidden', 'votes': 'Votes', 'buildindexes': 'BuildIndexes', 'address': 'Address', 'tags': 'Tags', 'arbiter': 'Arbiter'}
-    _toPy = {'Hidden': 'hidden', 'Priority': 'priority', 'SlaveDelay': 'slavedelay', 'Id': 'id_', 'Arbiter': 'arbiter', 'Votes': 'votes', 'Tags': 'tags', 'Address': 'address', 'BuildIndexes': 'buildindexes'}
+    _toSchema = {'address': 'Address', 'arbiter': 'Arbiter', 'buildindexes': 'BuildIndexes', 'hidden': 'Hidden', 'id_': 'Id', 'priority': 'Priority', 'slavedelay': 'SlaveDelay', 'tags': 'Tags', 'votes': 'Votes'}
+    _toPy = {'Address': 'address', 'Arbiter': 'arbiter', 'BuildIndexes': 'buildindexes', 'Hidden': 'hidden', 'Id': 'id_', 'Priority': 'priority', 'SlaveDelay': 'slavedelay', 'Tags': 'tags', 'Votes': 'votes'}
     def __init__(self, address=None, arbiter=None, buildindexes=None, hidden=None, id_=None, priority=None, slavedelay=None, tags=None, votes=None):
         '''
         address : str
@@ -2584,7 +3206,7 @@ class Member(Type):
         id_ : int
         priority : float
         slavedelay : int
-        tags : typing.Mapping[str, str]
+        tags : typing.Mapping<~KT, +VT_co>[str, str]
         votes : int
         '''
         self.address = address
@@ -2599,59 +3221,53 @@ class Member(Type):
 
 
 class MongoUpgradeResults(Type):
-    _toSchema = {'members': 'Members', 'master': 'Master', 'rsmembers': 'RsMembers'}
-    _toPy = {'Master': 'master', 'Members': 'members', 'RsMembers': 'rsmembers'}
-    def __init__(self, master=None, members=None, rsmembers=None):
+    _toSchema = {'ha_members': 'ha-members', 'master': 'master', 'rs_members': 'rs-members'}
+    _toPy = {'ha-members': 'ha_members', 'master': 'master', 'rs-members': 'rs_members'}
+    def __init__(self, ha_members=None, master=None, rs_members=None):
         '''
+        ha_members : typing.Sequence<+T_co>[~HAMember]<~HAMember>
         master : HAMember
-        members : typing.Sequence[~HAMember]
-        rsmembers : typing.Sequence[~Member]
+        rs_members : typing.Sequence<+T_co>[~Member]<~Member>
         '''
+        self.ha_members = [HAMember.from_json(o) for o in ha_members or []]
         self.master = HAMember.from_json(master) if master else None
-        self.members = [HAMember.from_json(o) for o in members or []]
-        self.rsmembers = [Member.from_json(o) for o in rsmembers or []]
-
-
-class ResumeReplicationParams(Type):
-    _toSchema = {'members': 'Members'}
-    _toPy = {'Members': 'members'}
-    def __init__(self, members=None):
-        '''
-        members : typing.Sequence[~Member]
-        '''
-        self.members = [Member.from_json(o) for o in members or []]
+        self.rs_members = [Member.from_json(o) for o in rs_members or []]
 
 
-class UpgradeMongoParams(Type):
-    _toSchema = {'minor': 'Minor', 'storageengine': 'StorageEngine', 'patch': 'Patch', 'major': 'Major'}
-    _toPy = {'Patch': 'patch', 'Major': 'major', 'StorageEngine': 'storageengine', 'Minor': 'minor'}
-    def __init__(self, major=None, minor=None, patch=None, storageengine=None):
+class MongoVersion(Type):
+    _toSchema = {'engine': 'engine', 'major': 'major', 'minor': 'minor', 'patch': 'patch'}
+    _toPy = {'engine': 'engine', 'major': 'major', 'minor': 'minor', 'patch': 'patch'}
+    def __init__(self, engine=None, major=None, minor=None, patch=None):
         '''
+        engine : str
         major : int
         minor : int
         patch : str
-        storageengine : str
         '''
+        self.engine = engine
         self.major = major
         self.minor = minor
         self.patch = patch
-        self.storageengine = storageengine
 
 
-class Version(Type):
-    _toSchema = {'minor': 'Minor', 'storageengine': 'StorageEngine', 'patch': 'Patch', 'major': 'Major'}
-    _toPy = {'Patch': 'patch', 'Major': 'major', 'StorageEngine': 'storageengine', 'Minor': 'minor'}
-    def __init__(self, major=None, minor=None, patch=None, storageengine=None):
+class ResumeReplicationParams(Type):
+    _toSchema = {'members': 'members'}
+    _toPy = {'members': 'members'}
+    def __init__(self, members=None):
         '''
-        major : int
-        minor : int
-        patch : str
-        storageengine : str
+        members : typing.Sequence<+T_co>[~Member]<~Member>
         '''
-        self.major = major
-        self.minor = minor
-        self.patch = patch
-        self.storageengine = storageengine
+        self.members = [Member.from_json(o) for o in members or []]
+
+
+class UpgradeMongoParams(Type):
+    _toSchema = {'target': 'target'}
+    _toPy = {'target': 'target'}
+    def __init__(self, target=None):
+        '''
+        target : MongoVersion
+        '''
+        self.target = MongoVersion.from_json(target) if target else None
 
 
 class SSHHostKeySet(Type):
@@ -2659,7 +3275,7 @@ class SSHHostKeySet(Type):
     _toPy = {'entity-keys': 'entity_keys'}
     def __init__(self, entity_keys=None):
         '''
-        entity_keys : typing.Sequence[~SSHHostKeys]
+        entity_keys : typing.Sequence<+T_co>[~SSHHostKeys]<~SSHHostKeys>
         '''
         self.entity_keys = [SSHHostKeys.from_json(o) for o in entity_keys or []]
 
@@ -2669,7 +3285,7 @@ class SSHHostKeys(Type):
     _toPy = {'public-keys': 'public_keys', 'tag': 'tag'}
     def __init__(self, public_keys=None, tag=None):
         '''
-        public_keys : typing.Sequence[str]
+        public_keys : typing.Sequence<+T_co>[str]
         tag : str
         '''
         self.public_keys = public_keys
@@ -2681,14 +3297,14 @@ class ImageFilterParams(Type):
     _toPy = {'images': 'images'}
     def __init__(self, images=None):
         '''
-        images : typing.Sequence[~ImageSpec]
+        images : typing.Sequence<+T_co>[~ImageSpec]<~ImageSpec>
         '''
         self.images = [ImageSpec.from_json(o) for o in images or []]
 
 
 class ImageMetadata(Type):
-    _toSchema = {'created': 'created', 'arch': 'arch', 'kind': 'kind', 'series': 'series', 'url': 'url'}
-    _toPy = {'created': 'created', 'arch': 'arch', 'kind': 'kind', 'series': 'series', 'url': 'url'}
+    _toSchema = {'arch': 'arch', 'created': 'created', 'kind': 'kind', 'series': 'series', 'url': 'url'}
+    _toPy = {'arch': 'arch', 'created': 'created', 'kind': 'kind', 'series': 'series', 'url': 'url'}
     def __init__(self, arch=None, created=None, kind=None, series=None, url=None):
         '''
         arch : str
@@ -2705,8 +3321,8 @@ class ImageMetadata(Type):
 
 
 class ImageSpec(Type):
-    _toSchema = {'series': 'series', 'arch': 'arch', 'kind': 'kind'}
-    _toPy = {'series': 'series', 'arch': 'arch', 'kind': 'kind'}
+    _toSchema = {'arch': 'arch', 'kind': 'kind', 'series': 'series'}
+    _toPy = {'arch': 'arch', 'kind': 'kind', 'series': 'series'}
     def __init__(self, arch=None, kind=None, series=None):
         '''
         arch : str
@@ -2723,14 +3339,14 @@ class ListImageResult(Type):
     _toPy = {'result': 'result'}
     def __init__(self, result=None):
         '''
-        result : typing.Sequence[~ImageMetadata]
+        result : typing.Sequence<+T_co>[~ImageMetadata]<~ImageMetadata>
         '''
         self.result = [ImageMetadata.from_json(o) for o in result or []]
 
 
 class CloudImageMetadata(Type):
-    _toSchema = {'image_id': 'image_id', 'priority': 'priority', 'series': 'series', 'region': 'region', 'virt_type': 'virt_type', 'version': 'version', 'root_storage_size': 'root_storage_size', 'stream': 'stream', 'arch': 'arch', 'source': 'source', 'root_storage_type': 'root_storage_type'}
-    _toPy = {'image_id': 'image_id', 'priority': 'priority', 'series': 'series', 'region': 'region', 'virt_type': 'virt_type', 'version': 'version', 'root_storage_size': 'root_storage_size', 'stream': 'stream', 'arch': 'arch', 'source': 'source', 'root_storage_type': 'root_storage_type'}
+    _toSchema = {'arch': 'arch', 'image_id': 'image-id', 'priority': 'priority', 'region': 'region', 'root_storage_size': 'root-storage-size', 'root_storage_type': 'root-storage-type', 'series': 'series', 'source': 'source', 'stream': 'stream', 'version': 'version', 'virt_type': 'virt-type'}
+    _toPy = {'arch': 'arch', 'image-id': 'image_id', 'priority': 'priority', 'region': 'region', 'root-storage-size': 'root_storage_size', 'root-storage-type': 'root_storage_type', 'series': 'series', 'source': 'source', 'stream': 'stream', 'version': 'version', 'virt-type': 'virt_type'}
     def __init__(self, arch=None, image_id=None, priority=None, region=None, root_storage_size=None, root_storage_type=None, series=None, source=None, stream=None, version=None, virt_type=None):
         '''
         arch : str
@@ -2763,20 +3379,20 @@ class CloudImageMetadataList(Type):
     _toPy = {'metadata': 'metadata'}
     def __init__(self, metadata=None):
         '''
-        metadata : typing.Sequence[~CloudImageMetadata]
+        metadata : typing.Sequence<+T_co>[~CloudImageMetadata]<~CloudImageMetadata>
         '''
         self.metadata = [CloudImageMetadata.from_json(o) for o in metadata or []]
 
 
 class ImageMetadataFilter(Type):
-    _toSchema = {'virt_type': 'virt_type', 'series': 'series', 'region': 'region', 'arches': 'arches', 'stream': 'stream', 'root_storage_type': 'root-storage-type'}
-    _toPy = {'virt_type': 'virt_type', 'series': 'series', 'region': 'region', 'arches': 'arches', 'stream': 'stream', 'root-storage-type': 'root_storage_type'}
+    _toSchema = {'arches': 'arches', 'region': 'region', 'root_storage_type': 'root-storage-type', 'series': 'series', 'stream': 'stream', 'virt_type': 'virt-type'}
+    _toPy = {'arches': 'arches', 'region': 'region', 'root-storage-type': 'root_storage_type', 'series': 'series', 'stream': 'stream', 'virt-type': 'virt_type'}
     def __init__(self, arches=None, region=None, root_storage_type=None, series=None, stream=None, virt_type=None):
         '''
-        arches : typing.Sequence[str]
+        arches : typing.Sequence<+T_co>[str]
         region : str
         root_storage_type : str
-        series : typing.Sequence[str]
+        series : typing.Sequence<+T_co>[str]
         stream : str
         virt_type : str
         '''
@@ -2793,17 +3409,17 @@ class ListCloudImageMetadataResult(Type):
     _toPy = {'result': 'result'}
     def __init__(self, result=None):
         '''
-        result : typing.Sequence[~CloudImageMetadata]
+        result : typing.Sequence<+T_co>[~CloudImageMetadata]<~CloudImageMetadata>
         '''
         self.result = [CloudImageMetadata.from_json(o) for o in result or []]
 
 
 class MetadataImageIds(Type):
-    _toSchema = {'image_ids': 'image_ids'}
-    _toPy = {'image_ids': 'image_ids'}
+    _toSchema = {'image_ids': 'image-ids'}
+    _toPy = {'image-ids': 'image_ids'}
     def __init__(self, image_ids=None):
         '''
-        image_ids : typing.Sequence[str]
+        image_ids : typing.Sequence<+T_co>[str]
         '''
         self.image_ids = image_ids
 
@@ -2813,33 +3429,17 @@ class MetadataSaveParams(Type):
     _toPy = {'metadata': 'metadata'}
     def __init__(self, metadata=None):
         '''
-        metadata : typing.Sequence[~CloudImageMetadataList]
+        metadata : typing.Sequence<+T_co>[~CloudImageMetadataList]<~CloudImageMetadataList>
         '''
         self.metadata = [CloudImageMetadataList.from_json(o) for o in metadata or []]
 
 
-class EntityStatusArgs(Type):
-    _toSchema = {'data': 'Data', 'tag': 'Tag', 'info': 'Info', 'status': 'Status'}
-    _toPy = {'Tag': 'tag', 'Status': 'status', 'Data': 'data', 'Info': 'info'}
-    def __init__(self, data=None, info=None, status=None, tag=None):
-        '''
-        data : typing.Mapping[str, typing.Any]
-        info : str
-        status : str
-        tag : str
-        '''
-        self.data = data
-        self.info = info
-        self.status = status
-        self.tag = tag
-
-
 class MachineAddresses(Type):
-    _toSchema = {'addresses': 'Addresses', 'tag': 'Tag'}
-    _toPy = {'Addresses': 'addresses', 'Tag': 'tag'}
+    _toSchema = {'addresses': 'addresses', 'tag': 'tag'}
+    _toPy = {'addresses': 'addresses', 'tag': 'tag'}
     def __init__(self, addresses=None, tag=None):
         '''
-        addresses : typing.Sequence[~Address]
+        addresses : typing.Sequence<+T_co>[~Address]<~Address>
         tag : str
         '''
         self.addresses = [Address.from_json(o) for o in addresses or []]
@@ -2847,11 +3447,11 @@ class MachineAddresses(Type):
 
 
 class MachineAddressesResult(Type):
-    _toSchema = {'addresses': 'Addresses', 'error': 'Error'}
-    _toPy = {'Addresses': 'addresses', 'Error': 'error'}
+    _toSchema = {'addresses': 'addresses', 'error': 'error'}
+    _toPy = {'addresses': 'addresses', 'error': 'error'}
     def __init__(self, addresses=None, error=None):
         '''
-        addresses : typing.Sequence[~Address]
+        addresses : typing.Sequence<+T_co>[~Address]<~Address>
         error : Error
         '''
         self.addresses = [Address.from_json(o) for o in addresses or []]
@@ -2859,41 +3459,31 @@ class MachineAddressesResult(Type):
 
 
 class MachineAddressesResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~MachineAddressesResult]
+        results : typing.Sequence<+T_co>[~MachineAddressesResult]<~MachineAddressesResult>
         '''
         self.results = [MachineAddressesResult.from_json(o) for o in results or []]
 
 
 class SetMachinesAddresses(Type):
-    _toSchema = {'machineaddresses': 'MachineAddresses'}
-    _toPy = {'MachineAddresses': 'machineaddresses'}
-    def __init__(self, machineaddresses=None):
-        '''
-        machineaddresses : typing.Sequence[~MachineAddresses]
-        '''
-        self.machineaddresses = [MachineAddresses.from_json(o) for o in machineaddresses or []]
-
-
-class SetStatus(Type):
-    _toSchema = {'entities': 'Entities'}
-    _toPy = {'Entities': 'entities'}
-    def __init__(self, entities=None):
+    _toSchema = {'machine_addresses': 'machine-addresses'}
+    _toPy = {'machine-addresses': 'machine_addresses'}
+    def __init__(self, machine_addresses=None):
         '''
-        entities : typing.Sequence[~EntityStatusArgs]
+        machine_addresses : typing.Sequence<+T_co>[~MachineAddresses]<~MachineAddresses>
         '''
-        self.entities = [EntityStatusArgs.from_json(o) for o in entities or []]
+        self.machine_addresses = [MachineAddresses.from_json(o) for o in machine_addresses or []]
 
 
 class StatusResult(Type):
-    _toSchema = {'since': 'Since', 'data': 'Data', 'info': 'Info', 'life': 'Life', 'error': 'Error', 'id_': 'Id', 'status': 'Status'}
-    _toPy = {'Id': 'id_', 'Data': 'data', 'Since': 'since', 'Error': 'error', 'Life': 'life', 'Status': 'status', 'Info': 'info'}
+    _toSchema = {'data': 'data', 'error': 'error', 'id_': 'id', 'info': 'info', 'life': 'life', 'since': 'since', 'status': 'status'}
+    _toPy = {'data': 'data', 'error': 'error', 'id': 'id_', 'info': 'info', 'life': 'life', 'since': 'since', 'status': 'status'}
     def __init__(self, data=None, error=None, id_=None, info=None, life=None, since=None, status=None):
         '''
-        data : typing.Mapping[str, typing.Any]
+        data : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         error : Error
         id_ : str
         info : str
@@ -2911,18 +3501,18 @@ class StatusResult(Type):
 
 
 class StatusResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~StatusResult]
+        results : typing.Sequence<+T_co>[~StatusResult]<~StatusResult>
         '''
         self.results = [StatusResult.from_json(o) for o in results or []]
 
 
 class ListSSHKeys(Type):
-    _toSchema = {'mode': 'Mode', 'entities': 'Entities'}
-    _toPy = {'Entities': 'entities', 'Mode': 'mode'}
+    _toSchema = {'entities': 'entities', 'mode': 'mode'}
+    _toPy = {'entities': 'entities', 'mode': 'mode'}
     def __init__(self, entities=None, mode=None):
         '''
         entities : Entities
@@ -2933,14 +3523,14 @@ class ListSSHKeys(Type):
 
 
 class ModifyUserSSHKeys(Type):
-    _toSchema = {'keys': 'Keys', 'user': 'User'}
-    _toPy = {'User': 'user', 'Keys': 'keys'}
-    def __init__(self, keys=None, user=None):
+    _toSchema = {'ssh_keys': 'ssh-keys', 'user': 'user'}
+    _toPy = {'ssh-keys': 'ssh_keys', 'user': 'user'}
+    def __init__(self, ssh_keys=None, user=None):
         '''
-        keys : typing.Sequence[str]
+        ssh_keys : typing.Sequence<+T_co>[str]
         user : str
         '''
-        self.keys = keys
+        self.ssh_keys = ssh_keys
         self.user = user
 
 
@@ -2955,50 +3545,120 @@ class ApplicationTag(Type):
 
 
 class ClaimLeadershipBulkParams(Type):
-    _toSchema = {'params': 'Params'}
-    _toPy = {'Params': 'params'}
+    _toSchema = {'params': 'params'}
+    _toPy = {'params': 'params'}
     def __init__(self, params=None):
         '''
-        params : typing.Sequence[~ClaimLeadershipParams]
+        params : typing.Sequence<+T_co>[~ClaimLeadershipParams]<~ClaimLeadershipParams>
         '''
         self.params = [ClaimLeadershipParams.from_json(o) for o in params or []]
 
 
 class ClaimLeadershipBulkResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ErrorResult]
+        results : typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         self.results = [ErrorResult.from_json(o) for o in results or []]
 
 
 class ClaimLeadershipParams(Type):
-    _toSchema = {'unittag': 'UnitTag', 'applicationtag': 'ApplicationTag', 'durationseconds': 'DurationSeconds'}
-    _toPy = {'UnitTag': 'unittag', 'DurationSeconds': 'durationseconds', 'ApplicationTag': 'applicationtag'}
-    def __init__(self, applicationtag=None, durationseconds=None, unittag=None):
+    _toSchema = {'application_tag': 'application-tag', 'duration': 'duration', 'unit_tag': 'unit-tag'}
+    _toPy = {'application-tag': 'application_tag', 'duration': 'duration', 'unit-tag': 'unit_tag'}
+    def __init__(self, application_tag=None, duration=None, unit_tag=None):
+        '''
+        application_tag : str
+        duration : float
+        unit_tag : str
+        '''
+        self.application_tag = application_tag
+        self.duration = duration
+        self.unit_tag = unit_tag
+
+
+class LogForwardingGetLastSentParams(Type):
+    _toSchema = {'ids': 'ids'}
+    _toPy = {'ids': 'ids'}
+    def __init__(self, ids=None):
+        '''
+        ids : typing.Sequence<+T_co>[~LogForwardingID]<~LogForwardingID>
+        '''
+        self.ids = [LogForwardingID.from_json(o) for o in ids or []]
+
+
+class LogForwardingGetLastSentResult(Type):
+    _toSchema = {'err': 'err', 'record_id': 'record-id', 'record_timestamp': 'record-timestamp'}
+    _toPy = {'err': 'err', 'record-id': 'record_id', 'record-timestamp': 'record_timestamp'}
+    def __init__(self, err=None, record_id=None, record_timestamp=None):
+        '''
+        err : Error
+        record_id : int
+        record_timestamp : int
+        '''
+        self.err = Error.from_json(err) if err else None
+        self.record_id = record_id
+        self.record_timestamp = record_timestamp
+
+
+class LogForwardingGetLastSentResults(Type):
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
+    def __init__(self, results=None):
+        '''
+        results : typing.Sequence<+T_co>[~LogForwardingGetLastSentResult]<~LogForwardingGetLastSentResult>
+        '''
+        self.results = [LogForwardingGetLastSentResult.from_json(o) for o in results or []]
+
+
+class LogForwardingID(Type):
+    _toSchema = {'model': 'model', 'sink': 'sink'}
+    _toPy = {'model': 'model', 'sink': 'sink'}
+    def __init__(self, model=None, sink=None):
+        '''
+        model : str
+        sink : str
+        '''
+        self.model = model
+        self.sink = sink
+
+
+class LogForwardingSetLastSentParam(Type):
+    _toSchema = {'logforwardingid': 'LogForwardingID', 'record_id': 'record-id', 'record_timestamp': 'record-timestamp'}
+    _toPy = {'LogForwardingID': 'logforwardingid', 'record-id': 'record_id', 'record-timestamp': 'record_timestamp'}
+    def __init__(self, logforwardingid=None, record_id=None, record_timestamp=None):
+        '''
+        logforwardingid : LogForwardingID
+        record_id : int
+        record_timestamp : int
+        '''
+        self.logforwardingid = LogForwardingID.from_json(logforwardingid) if logforwardingid else None
+        self.record_id = record_id
+        self.record_timestamp = record_timestamp
+
+
+class LogForwardingSetLastSentParams(Type):
+    _toSchema = {'params': 'params'}
+    _toPy = {'params': 'params'}
+    def __init__(self, params=None):
         '''
-        applicationtag : str
-        durationseconds : float
-        unittag : str
+        params : typing.Sequence<+T_co>[~LogForwardingSetLastSentParam]<~LogForwardingSetLastSentParam>
         '''
-        self.applicationtag = applicationtag
-        self.durationseconds = durationseconds
-        self.unittag = unittag
+        self.params = [LogForwardingSetLastSentParam.from_json(o) for o in params or []]
 
 
 class ActionExecutionResult(Type):
-    _toSchema = {'message': 'message', 'results': 'results', 'actiontag': 'actiontag', 'status': 'status'}
-    _toPy = {'message': 'message', 'results': 'results', 'actiontag': 'actiontag', 'status': 'status'}
-    def __init__(self, actiontag=None, message=None, results=None, status=None):
+    _toSchema = {'action_tag': 'action-tag', 'message': 'message', 'results': 'results', 'status': 'status'}
+    _toPy = {'action-tag': 'action_tag', 'message': 'message', 'results': 'results', 'status': 'status'}
+    def __init__(self, action_tag=None, message=None, results=None, status=None):
         '''
-        actiontag : str
+        action_tag : str
         message : str
-        results : typing.Mapping[str, typing.Any]
+        results : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         status : str
         '''
-        self.actiontag = actiontag
+        self.action_tag = action_tag
         self.message = message
         self.results = results
         self.status = status
@@ -3009,87 +3669,147 @@ class ActionExecutionResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ActionExecutionResult]
+        results : typing.Sequence<+T_co>[~ActionExecutionResult]<~ActionExecutionResult>
         '''
         self.results = [ActionExecutionResult.from_json(o) for o in results or []]
 
 
+class EntitiesResult(Type):
+    _toSchema = {'entities': 'entities', 'error': 'error'}
+    _toPy = {'entities': 'entities', 'error': 'error'}
+    def __init__(self, entities=None, error=None):
+        '''
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        error : Error
+        '''
+        self.entities = [Entity.from_json(o) for o in entities or []]
+        self.error = Error.from_json(error) if error else None
+
+
+class EntitiesResults(Type):
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
+    def __init__(self, results=None):
+        '''
+        results : typing.Sequence<+T_co>[~EntitiesResult]<~EntitiesResult>
+        '''
+        self.results = [EntitiesResult.from_json(o) for o in results or []]
+
+
+class ProviderInterfaceInfo(Type):
+    _toSchema = {'interface_name': 'interface-name', 'mac_address': 'mac-address', 'provider_id': 'provider-id'}
+    _toPy = {'interface-name': 'interface_name', 'mac-address': 'mac_address', 'provider-id': 'provider_id'}
+    def __init__(self, interface_name=None, mac_address=None, provider_id=None):
+        '''
+        interface_name : str
+        mac_address : str
+        provider_id : str
+        '''
+        self.interface_name = interface_name
+        self.mac_address = mac_address
+        self.provider_id = provider_id
+
+
+class ProviderInterfaceInfoResult(Type):
+    _toSchema = {'error': 'error', 'interfaces': 'interfaces', 'machine_tag': 'machine-tag'}
+    _toPy = {'error': 'error', 'interfaces': 'interfaces', 'machine-tag': 'machine_tag'}
+    def __init__(self, error=None, interfaces=None, machine_tag=None):
+        '''
+        error : Error
+        interfaces : typing.Sequence<+T_co>[~ProviderInterfaceInfo]<~ProviderInterfaceInfo>
+        machine_tag : str
+        '''
+        self.error = Error.from_json(error) if error else None
+        self.interfaces = [ProviderInterfaceInfo.from_json(o) for o in interfaces or []]
+        self.machine_tag = machine_tag
+
+
+class ProviderInterfaceInfoResults(Type):
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
+    def __init__(self, results=None):
+        '''
+        results : typing.Sequence<+T_co>[~ProviderInterfaceInfoResult]<~ProviderInterfaceInfoResult>
+        '''
+        self.results = [ProviderInterfaceInfoResult.from_json(o) for o in results or []]
+
+
 class JobsResult(Type):
-    _toSchema = {'jobs': 'Jobs', 'error': 'Error'}
-    _toPy = {'Error': 'error', 'Jobs': 'jobs'}
+    _toSchema = {'error': 'error', 'jobs': 'jobs'}
+    _toPy = {'error': 'error', 'jobs': 'jobs'}
     def __init__(self, error=None, jobs=None):
         '''
         error : Error
-        jobs : typing.Sequence[str]
+        jobs : typing.Sequence<+T_co>[str]
         '''
         self.error = Error.from_json(error) if error else None
         self.jobs = jobs
 
 
 class JobsResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~JobsResult]
+        results : typing.Sequence<+T_co>[~JobsResult]<~JobsResult>
         '''
         self.results = [JobsResult.from_json(o) for o in results or []]
 
 
 class NetworkConfig(Type):
-    _toSchema = {'mtu': 'MTU', 'disabled': 'Disabled', 'interfacename': 'InterfaceName', 'dnsservers': 'DNSServers', 'providerid': 'ProviderId', 'providersubnetid': 'ProviderSubnetId', 'deviceindex': 'DeviceIndex', 'vlantag': 'VLANTag', 'provideraddressid': 'ProviderAddressId', 'dnssearchdomains': 'DNSSearchDomains', 'noautostart': 'NoAutoStart', 'macaddress': 'MACAddress', 'address': 'Address', 'cidr': 'CIDR', 'interfacetype': 'InterfaceType', 'parentinterfacename': 'ParentInterfaceName', 'gatewayaddress': 'GatewayAddress', 'providervlanid': 'ProviderVLANId', 'configtype': 'ConfigType', 'providerspaceid': 'ProviderSpaceId'}
-    _toPy = {'InterfaceType': 'interfacetype', 'ConfigType': 'configtype', 'ProviderVLANId': 'providervlanid', 'ProviderAddressId': 'provideraddressid', 'Disabled': 'disabled', 'ProviderSpaceId': 'providerspaceid', 'GatewayAddress': 'gatewayaddress', 'InterfaceName': 'interfacename', 'ProviderSubnetId': 'providersubnetid', 'MTU': 'mtu', 'VLANTag': 'vlantag', 'NoAutoStart': 'noautostart', 'DNSServers': 'dnsservers', 'DNSSearchDomains': 'dnssearchdomains', 'DeviceIndex': 'deviceindex', 'Address': 'address', 'ProviderId': 'providerid', 'MACAddress': 'macaddress', 'CIDR': 'cidr', 'ParentInterfaceName': 'parentinterfacename'}
-    def __init__(self, address=None, cidr=None, configtype=None, dnssearchdomains=None, dnsservers=None, deviceindex=None, disabled=None, gatewayaddress=None, interfacename=None, interfacetype=None, macaddress=None, mtu=None, noautostart=None, parentinterfacename=None, provideraddressid=None, providerid=None, providerspaceid=None, providersubnetid=None, providervlanid=None, vlantag=None):
+    _toSchema = {'address': 'address', 'cidr': 'cidr', 'config_type': 'config-type', 'device_index': 'device-index', 'disabled': 'disabled', 'dns_search_domains': 'dns-search-domains', 'dns_servers': 'dns-servers', 'gateway_address': 'gateway-address', 'interface_name': 'interface-name', 'interface_type': 'interface-type', 'mac_address': 'mac-address', 'mtu': 'mtu', 'no_auto_start': 'no-auto-start', 'parent_interface_name': 'parent-interface-name', 'provider_address_id': 'provider-address-id', 'provider_id': 'provider-id', 'provider_space_id': 'provider-space-id', 'provider_subnet_id': 'provider-subnet-id', 'provider_vlan_id': 'provider-vlan-id', 'vlan_tag': 'vlan-tag'}
+    _toPy = {'address': 'address', 'cidr': 'cidr', 'config-type': 'config_type', 'device-index': 'device_index', 'disabled': 'disabled', 'dns-search-domains': 'dns_search_domains', 'dns-servers': 'dns_servers', 'gateway-address': 'gateway_address', 'interface-name': 'interface_name', 'interface-type': 'interface_type', 'mac-address': 'mac_address', 'mtu': 'mtu', 'no-auto-start': 'no_auto_start', 'parent-interface-name': 'parent_interface_name', 'provider-address-id': 'provider_address_id', 'provider-id': 'provider_id', 'provider-space-id': 'provider_space_id', 'provider-subnet-id': 'provider_subnet_id', 'provider-vlan-id': 'provider_vlan_id', 'vlan-tag': 'vlan_tag'}
+    def __init__(self, address=None, cidr=None, config_type=None, device_index=None, disabled=None, dns_search_domains=None, dns_servers=None, gateway_address=None, interface_name=None, interface_type=None, mac_address=None, mtu=None, no_auto_start=None, parent_interface_name=None, provider_address_id=None, provider_id=None, provider_space_id=None, provider_subnet_id=None, provider_vlan_id=None, vlan_tag=None):
         '''
         address : str
         cidr : str
-        configtype : str
-        dnssearchdomains : typing.Sequence[str]
-        dnsservers : typing.Sequence[str]
-        deviceindex : int
+        config_type : str
+        device_index : int
         disabled : bool
-        gatewayaddress : str
-        interfacename : str
-        interfacetype : str
-        macaddress : str
+        dns_search_domains : typing.Sequence<+T_co>[str]
+        dns_servers : typing.Sequence<+T_co>[str]
+        gateway_address : str
+        interface_name : str
+        interface_type : str
+        mac_address : str
         mtu : int
-        noautostart : bool
-        parentinterfacename : str
-        provideraddressid : str
-        providerid : str
-        providerspaceid : str
-        providersubnetid : str
-        providervlanid : str
-        vlantag : int
+        no_auto_start : bool
+        parent_interface_name : str
+        provider_address_id : str
+        provider_id : str
+        provider_space_id : str
+        provider_subnet_id : str
+        provider_vlan_id : str
+        vlan_tag : int
         '''
         self.address = address
         self.cidr = cidr
-        self.configtype = configtype
-        self.dnssearchdomains = dnssearchdomains
-        self.dnsservers = dnsservers
-        self.deviceindex = deviceindex
+        self.config_type = config_type
+        self.device_index = device_index
         self.disabled = disabled
-        self.gatewayaddress = gatewayaddress
-        self.interfacename = interfacename
-        self.interfacetype = interfacetype
-        self.macaddress = macaddress
+        self.dns_search_domains = dns_search_domains
+        self.dns_servers = dns_servers
+        self.gateway_address = gateway_address
+        self.interface_name = interface_name
+        self.interface_type = interface_type
+        self.mac_address = mac_address
         self.mtu = mtu
-        self.noautostart = noautostart
-        self.parentinterfacename = parentinterfacename
-        self.provideraddressid = provideraddressid
-        self.providerid = providerid
-        self.providerspaceid = providerspaceid
-        self.providersubnetid = providersubnetid
-        self.providervlanid = providervlanid
-        self.vlantag = vlantag
+        self.no_auto_start = no_auto_start
+        self.parent_interface_name = parent_interface_name
+        self.provider_address_id = provider_address_id
+        self.provider_id = provider_id
+        self.provider_space_id = provider_space_id
+        self.provider_subnet_id = provider_subnet_id
+        self.provider_vlan_id = provider_vlan_id
+        self.vlan_tag = vlan_tag
 
 
 class SetMachineNetworkConfig(Type):
-    _toSchema = {'config': 'Config', 'tag': 'Tag'}
-    _toPy = {'Tag': 'tag', 'Config': 'config'}
+    _toSchema = {'config': 'config', 'tag': 'tag'}
+    _toPy = {'config': 'config', 'tag': 'tag'}
     def __init__(self, config=None, tag=None):
         '''
-        config : typing.Sequence[~NetworkConfig]
+        config : typing.Sequence<+T_co>[~NetworkConfig]<~NetworkConfig>
         tag : str
         '''
         self.config = [NetworkConfig.from_json(o) for o in config or []]
@@ -3097,8 +3817,8 @@ class SetMachineNetworkConfig(Type):
 
 
 class MeterStatusResult(Type):
-    _toSchema = {'code': 'Code', 'error': 'Error', 'info': 'Info'}
-    _toPy = {'Code': 'code', 'Error': 'error', 'Info': 'info'}
+    _toSchema = {'code': 'code', 'error': 'error', 'info': 'info'}
+    _toPy = {'code': 'code', 'error': 'error', 'info': 'info'}
     def __init__(self, code=None, error=None, info=None):
         '''
         code : str
@@ -3111,18 +3831,18 @@ class MeterStatusResult(Type):
 
 
 class MeterStatusResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~MeterStatusResult]
+        results : typing.Sequence<+T_co>[~MeterStatusResult]<~MeterStatusResult>
         '''
         self.results = [MeterStatusResult.from_json(o) for o in results or []]
 
 
 class Metric(Type):
-    _toSchema = {'key': 'Key', 'time': 'Time', 'value': 'Value'}
-    _toPy = {'Value': 'value', 'Key': 'key', 'Time': 'time'}
+    _toSchema = {'key': 'key', 'time': 'time', 'value': 'value'}
+    _toPy = {'key': 'key', 'time': 'time', 'value': 'value'}
     def __init__(self, key=None, time=None, value=None):
         '''
         key : str
@@ -3135,24 +3855,24 @@ class Metric(Type):
 
 
 class MetricBatch(Type):
-    _toSchema = {'charmurl': 'CharmURL', 'uuid': 'UUID', 'created': 'Created', 'metrics': 'Metrics'}
-    _toPy = {'CharmURL': 'charmurl', 'Metrics': 'metrics', 'Created': 'created', 'UUID': 'uuid'}
-    def __init__(self, charmurl=None, created=None, metrics=None, uuid=None):
+    _toSchema = {'charm_url': 'charm-url', 'created': 'created', 'metrics': 'metrics', 'uuid': 'uuid'}
+    _toPy = {'charm-url': 'charm_url', 'created': 'created', 'metrics': 'metrics', 'uuid': 'uuid'}
+    def __init__(self, charm_url=None, created=None, metrics=None, uuid=None):
         '''
-        charmurl : str
+        charm_url : str
         created : str
-        metrics : typing.Sequence[~Metric]
+        metrics : typing.Sequence<+T_co>[~Metric]<~Metric>
         uuid : str
         '''
-        self.charmurl = charmurl
+        self.charm_url = charm_url
         self.created = created
         self.metrics = [Metric.from_json(o) for o in metrics or []]
         self.uuid = uuid
 
 
 class MetricBatchParam(Type):
-    _toSchema = {'batch': 'Batch', 'tag': 'Tag'}
-    _toPy = {'Tag': 'tag', 'Batch': 'batch'}
+    _toSchema = {'batch': 'batch', 'tag': 'tag'}
+    _toPy = {'batch': 'batch', 'tag': 'tag'}
     def __init__(self, batch=None, tag=None):
         '''
         batch : MetricBatch
@@ -3163,11 +3883,11 @@ class MetricBatchParam(Type):
 
 
 class MetricBatchParams(Type):
-    _toSchema = {'batches': 'Batches'}
-    _toPy = {'Batches': 'batches'}
+    _toSchema = {'batches': 'batches'}
+    _toPy = {'batches': 'batches'}
     def __init__(self, batches=None):
         '''
-        batches : typing.Sequence[~MetricBatchParam]
+        batches : typing.Sequence<+T_co>[~MetricBatchParam]<~MetricBatchParam>
         '''
         self.batches = [MetricBatchParam.from_json(o) for o in batches or []]
 
@@ -3178,15 +3898,15 @@ class EntityMetrics(Type):
     def __init__(self, error=None, metrics=None):
         '''
         error : Error
-        metrics : typing.Sequence[~MetricResult]
+        metrics : typing.Sequence<+T_co>[~MetricResult]<~MetricResult>
         '''
         self.error = Error.from_json(error) if error else None
         self.metrics = [MetricResult.from_json(o) for o in metrics or []]
 
 
 class MeterStatusParam(Type):
-    _toSchema = {'code': 'code', 'tag': 'tag', 'info': 'info'}
-    _toPy = {'code': 'code', 'tag': 'tag', 'info': 'info'}
+    _toSchema = {'code': 'code', 'info': 'info', 'tag': 'tag'}
+    _toPy = {'code': 'code', 'info': 'info', 'tag': 'tag'}
     def __init__(self, code=None, info=None, tag=None):
         '''
         code : str
@@ -3203,22 +3923,24 @@ class MeterStatusParams(Type):
     _toPy = {'statues': 'statues'}
     def __init__(self, statues=None):
         '''
-        statues : typing.Sequence[~MeterStatusParam]
+        statues : typing.Sequence<+T_co>[~MeterStatusParam]<~MeterStatusParam>
         '''
         self.statues = [MeterStatusParam.from_json(o) for o in statues or []]
 
 
 class MetricResult(Type):
-    _toSchema = {'key': 'key', 'time': 'time', 'value': 'value'}
-    _toPy = {'key': 'key', 'time': 'time', 'value': 'value'}
-    def __init__(self, key=None, time=None, value=None):
+    _toSchema = {'key': 'key', 'time': 'time', 'unit': 'unit', 'value': 'value'}
+    _toPy = {'key': 'key', 'time': 'time', 'unit': 'unit', 'value': 'value'}
+    def __init__(self, key=None, time=None, unit=None, value=None):
         '''
         key : str
         time : str
+        unit : str
         value : str
         '''
         self.key = key
         self.time = time
+        self.unit = unit
         self.value = value
 
 
@@ -3227,14 +3949,14 @@ class MetricResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~EntityMetrics]
+        results : typing.Sequence<+T_co>[~EntityMetrics]<~EntityMetrics>
         '''
         self.results = [EntityMetrics.from_json(o) for o in results or []]
 
 
 class PhaseResult(Type):
-    _toSchema = {'error': 'Error', 'phase': 'phase'}
-    _toPy = {'Error': 'error', 'phase': 'phase'}
+    _toSchema = {'error': 'error', 'phase': 'phase'}
+    _toPy = {'error': 'error', 'phase': 'phase'}
     def __init__(self, error=None, phase=None):
         '''
         error : Error
@@ -3245,37 +3967,91 @@ class PhaseResult(Type):
 
 
 class PhaseResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~PhaseResult]
+        results : typing.Sequence<+T_co>[~PhaseResult]<~PhaseResult>
         '''
         self.results = [PhaseResult.from_json(o) for o in results or []]
 
 
-class FullMigrationStatus(Type):
-    _toSchema = {'attempt': 'attempt', 'phase': 'phase', 'spec': 'spec'}
-    _toPy = {'attempt': 'attempt', 'phase': 'phase', 'spec': 'spec'}
-    def __init__(self, attempt=None, phase=None, spec=None):
+class MasterMigrationStatus(Type):
+    _toSchema = {'migration_id': 'migration-id', 'phase': 'phase', 'phase_changed_time': 'phase-changed-time', 'spec': 'spec'}
+    _toPy = {'migration-id': 'migration_id', 'phase': 'phase', 'phase-changed-time': 'phase_changed_time', 'spec': 'spec'}
+    def __init__(self, migration_id=None, phase=None, phase_changed_time=None, spec=None):
         '''
-        attempt : int
+        migration_id : str
         phase : str
-        spec : ModelMigrationSpec
+        phase_changed_time : str
+        spec : MigrationSpec
         '''
-        self.attempt = attempt
+        self.migration_id = migration_id
+        self.phase = phase
+        self.phase_changed_time = phase_changed_time
+        self.spec = MigrationSpec.from_json(spec) if spec else None
+
+
+class MigrationModelInfo(Type):
+    _toSchema = {'agent_version': 'agent-version', 'name': 'name', 'owner_tag': 'owner-tag', 'uuid': 'uuid'}
+    _toPy = {'agent-version': 'agent_version', 'name': 'name', 'owner-tag': 'owner_tag', 'uuid': 'uuid'}
+    def __init__(self, agent_version=None, name=None, owner_tag=None, uuid=None):
+        '''
+        agent_version : Number
+        name : str
+        owner_tag : str
+        uuid : str
+        '''
+        self.agent_version = Number.from_json(agent_version) if agent_version else None
+        self.name = name
+        self.owner_tag = owner_tag
+        self.uuid = uuid
+
+
+class MinionReports(Type):
+    _toSchema = {'failed': 'failed', 'migration_id': 'migration-id', 'phase': 'phase', 'success_count': 'success-count', 'unknown_count': 'unknown-count', 'unknown_sample': 'unknown-sample'}
+    _toPy = {'failed': 'failed', 'migration-id': 'migration_id', 'phase': 'phase', 'success-count': 'success_count', 'unknown-count': 'unknown_count', 'unknown-sample': 'unknown_sample'}
+    def __init__(self, failed=None, migration_id=None, phase=None, success_count=None, unknown_count=None, unknown_sample=None):
+        '''
+        failed : typing.Sequence<+T_co>[str]
+        migration_id : str
+        phase : str
+        success_count : int
+        unknown_count : int
+        unknown_sample : typing.Sequence<+T_co>[str]
+        '''
+        self.failed = failed
+        self.migration_id = migration_id
         self.phase = phase
-        self.spec = ModelMigrationSpec.from_json(spec) if spec else None
+        self.success_count = success_count
+        self.unknown_count = unknown_count
+        self.unknown_sample = unknown_sample
 
 
 class SerializedModel(Type):
-    _toSchema = {'bytes_': 'bytes'}
-    _toPy = {'bytes': 'bytes_'}
-    def __init__(self, bytes_=None):
+    _toSchema = {'bytes_': 'bytes', 'charms': 'charms', 'tools': 'tools'}
+    _toPy = {'bytes': 'bytes_', 'charms': 'charms', 'tools': 'tools'}
+    def __init__(self, bytes_=None, charms=None, tools=None):
         '''
-        bytes_ : typing.Sequence[int]
+        bytes_ : typing.Sequence<+T_co>[int]
+        charms : typing.Sequence<+T_co>[str]
+        tools : typing.Sequence<+T_co>[~SerializedModelTools]<~SerializedModelTools>
         '''
         self.bytes_ = bytes_
+        self.charms = charms
+        self.tools = [SerializedModelTools.from_json(o) for o in tools or []]
+
+
+class SerializedModelTools(Type):
+    _toSchema = {'uri': 'uri', 'version': 'version'}
+    _toPy = {'uri': 'uri', 'version': 'version'}
+    def __init__(self, uri=None, version=None):
+        '''
+        uri : str
+        version : str
+        '''
+        self.uri = uri
+        self.version = version
 
 
 class SetMigrationPhaseArgs(Type):
@@ -3288,19 +4064,47 @@ class SetMigrationPhaseArgs(Type):
         self.phase = phase
 
 
+class SetMigrationStatusMessageArgs(Type):
+    _toSchema = {'message': 'message'}
+    _toPy = {'message': 'message'}
+    def __init__(self, message=None):
+        '''
+        message : str
+        '''
+        self.message = message
+
+
+class MinionReport(Type):
+    _toSchema = {'migration_id': 'migration-id', 'phase': 'phase', 'success': 'success'}
+    _toPy = {'migration-id': 'migration_id', 'phase': 'phase', 'success': 'success'}
+    def __init__(self, migration_id=None, phase=None, success=None):
+        '''
+        migration_id : str
+        phase : str
+        success : bool
+        '''
+        self.migration_id = migration_id
+        self.phase = phase
+        self.success = success
+
+
 class MigrationStatus(Type):
-    _toSchema = {'attempt': 'attempt', 'source_api_addrs': 'source-api-addrs', 'target_api_addrs': 'target-api-addrs', 'source_ca_cert': 'source-ca-cert', 'phase': 'phase', 'target_ca_cert': 'target-ca-cert'}
-    _toPy = {'target-ca-cert': 'target_ca_cert', 'source-ca-cert': 'source_ca_cert', 'attempt': 'attempt', 'source-api-addrs': 'source_api_addrs', 'phase': 'phase', 'target-api-addrs': 'target_api_addrs'}
-    def __init__(self, attempt=None, phase=None, source_api_addrs=None, source_ca_cert=None, target_api_addrs=None, target_ca_cert=None):
+    _toSchema = {'attempt': 'attempt', 'external_control': 'external-control', 'migration_id': 'migration-id', 'phase': 'phase', 'source_api_addrs': 'source-api-addrs', 'source_ca_cert': 'source-ca-cert', 'target_api_addrs': 'target-api-addrs', 'target_ca_cert': 'target-ca-cert'}
+    _toPy = {'attempt': 'attempt', 'external-control': 'external_control', 'migration-id': 'migration_id', 'phase': 'phase', 'source-api-addrs': 'source_api_addrs', 'source-ca-cert': 'source_ca_cert', 'target-api-addrs': 'target_api_addrs', 'target-ca-cert': 'target_ca_cert'}
+    def __init__(self, attempt=None, external_control=None, migration_id=None, phase=None, source_api_addrs=None, source_ca_cert=None, target_api_addrs=None, target_ca_cert=None):
         '''
         attempt : int
+        external_control : bool
+        migration_id : str
         phase : str
-        source_api_addrs : typing.Sequence[str]
+        source_api_addrs : typing.Sequence<+T_co>[str]
         source_ca_cert : str
-        target_api_addrs : typing.Sequence[str]
+        target_api_addrs : typing.Sequence<+T_co>[str]
         target_ca_cert : str
         '''
         self.attempt = attempt
+        self.external_control = external_control
+        self.migration_id = migration_id
         self.phase = phase
         self.source_api_addrs = source_api_addrs
         self.source_ca_cert = source_ca_cert
@@ -3318,23 +4122,89 @@ class ModelArgs(Type):
         self.model_tag = model_tag
 
 
+class MapResult(Type):
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
+    def __init__(self, error=None, result=None):
+        '''
+        error : Error
+        result : typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        '''
+        self.error = Error.from_json(error) if error else None
+        self.result = result
+
+
+class MapResults(Type):
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
+    def __init__(self, results=None):
+        '''
+        results : typing.Sequence<+T_co>[~MapResult]<~MapResult>
+        '''
+        self.results = [MapResult.from_json(o) for o in results or []]
+
+
 class ModelCreateArgs(Type):
-    _toSchema = {'account': 'Account', 'ownertag': 'OwnerTag', 'config': 'Config'}
-    _toPy = {'Account': 'account', 'OwnerTag': 'ownertag', 'Config': 'config'}
-    def __init__(self, account=None, config=None, ownertag=None):
+    _toSchema = {'cloud_tag': 'cloud-tag', 'config': 'config', 'credential': 'credential', 'name': 'name', 'owner_tag': 'owner-tag', 'region': 'region'}
+    _toPy = {'cloud-tag': 'cloud_tag', 'config': 'config', 'credential': 'credential', 'name': 'name', 'owner-tag': 'owner_tag', 'region': 'region'}
+    def __init__(self, cloud_tag=None, config=None, credential=None, name=None, owner_tag=None, region=None):
+        '''
+        cloud_tag : str
+        config : typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        credential : str
+        name : str
+        owner_tag : str
+        region : str
+        '''
+        self.cloud_tag = cloud_tag
+        self.config = config
+        self.credential = credential
+        self.name = name
+        self.owner_tag = owner_tag
+        self.region = region
+
+
+class ModelDefaultValues(Type):
+    _toSchema = {'cloud_region': 'cloud-region', 'cloud_tag': 'cloud-tag', 'config': 'config'}
+    _toPy = {'cloud-region': 'cloud_region', 'cloud-tag': 'cloud_tag', 'config': 'config'}
+    def __init__(self, cloud_region=None, cloud_tag=None, config=None):
+        '''
+        cloud_region : str
+        cloud_tag : str
+        config : typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        '''
+        self.cloud_region = cloud_region
+        self.cloud_tag = cloud_tag
+        self.config = config
+
+
+class ModelDefaults(Type):
+    _toSchema = {'controller': 'controller', 'default': 'default', 'regions': 'regions'}
+    _toPy = {'controller': 'controller', 'default': 'default', 'regions': 'regions'}
+    def __init__(self, controller=None, default=None, regions=None):
+        '''
+        controller : typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        default : typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        regions : typing.Sequence<+T_co>[~RegionDefaults]<~RegionDefaults>
         '''
-        account : typing.Mapping[str, typing.Any]
-        config : typing.Mapping[str, typing.Any]
-        ownertag : str
+        self.controller = controller
+        self.default = default
+        self.regions = [RegionDefaults.from_json(o) for o in regions or []]
+
+
+class ModelDefaultsResult(Type):
+    _toSchema = {'config': 'config'}
+    _toPy = {'config': 'config'}
+    def __init__(self, config=None):
+        '''
+        config : typing.Mapping<~KT, +VT_co>[str, ~ModelDefaults]<~ModelDefaults>
         '''
-        self.account = account
         self.config = config
-        self.ownertag = ownertag
 
 
 class ModelInfoResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -3349,26 +4219,28 @@ class ModelInfoResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ModelInfoResult]
+        results : typing.Sequence<+T_co>[~ModelInfoResult]<~ModelInfoResult>
         '''
         self.results = [ModelInfoResult.from_json(o) for o in results or []]
 
 
-class ModelSkeletonConfigArgs(Type):
-    _toSchema = {'region': 'Region', 'provider': 'Provider'}
-    _toPy = {'Provider': 'provider', 'Region': 'region'}
-    def __init__(self, provider=None, region=None):
+class ModelUnsetKeys(Type):
+    _toSchema = {'cloud_region': 'cloud-region', 'cloud_tag': 'cloud-tag', 'keys': 'keys'}
+    _toPy = {'cloud-region': 'cloud_region', 'cloud-tag': 'cloud_tag', 'keys': 'keys'}
+    def __init__(self, cloud_region=None, cloud_tag=None, keys=None):
         '''
-        provider : str
-        region : str
+        cloud_region : str
+        cloud_tag : str
+        keys : typing.Sequence<+T_co>[str]
         '''
-        self.provider = provider
-        self.region = region
+        self.cloud_region = cloud_region
+        self.cloud_tag = cloud_tag
+        self.keys = keys
 
 
 class ModifyModelAccess(Type):
-    _toSchema = {'action': 'action', 'model_tag': 'model-tag', 'user_tag': 'user-tag', 'access': 'access'}
-    _toPy = {'user-tag': 'user_tag', 'action': 'action', 'model-tag': 'model_tag', 'access': 'access'}
+    _toSchema = {'access': 'access', 'action': 'action', 'model_tag': 'model-tag', 'user_tag': 'user-tag'}
+    _toPy = {'access': 'access', 'action': 'action', 'model-tag': 'model_tag', 'user-tag': 'user_tag'}
     def __init__(self, access=None, action=None, model_tag=None, user_tag=None):
         '''
         access : str
@@ -3387,14 +4259,46 @@ class ModifyModelAccessRequest(Type):
     _toPy = {'changes': 'changes'}
     def __init__(self, changes=None):
         '''
-        changes : typing.Sequence[~ModifyModelAccess]
+        changes : typing.Sequence<+T_co>[~ModifyModelAccess]<~ModifyModelAccess>
         '''
         self.changes = [ModifyModelAccess.from_json(o) for o in changes or []]
 
 
+class RegionDefaults(Type):
+    _toSchema = {'region_name': 'region-name', 'value': 'value'}
+    _toPy = {'region-name': 'region_name', 'value': 'value'}
+    def __init__(self, region_name=None, value=None):
+        '''
+        region_name : str
+        value : typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        '''
+        self.region_name = region_name
+        self.value = value
+
+
+class SetModelDefaults(Type):
+    _toSchema = {'config': 'config'}
+    _toPy = {'config': 'config'}
+    def __init__(self, config=None):
+        '''
+        config : typing.Sequence<+T_co>[~ModelDefaultValues]<~ModelDefaultValues>
+        '''
+        self.config = [ModelDefaultValues.from_json(o) for o in config or []]
+
+
+class UnsetModelDefaults(Type):
+    _toSchema = {'keys': 'keys'}
+    _toPy = {'keys': 'keys'}
+    def __init__(self, keys=None):
+        '''
+        keys : typing.Sequence<+T_co>[~ModelUnsetKeys]<~ModelUnsetKeys>
+        '''
+        self.keys = [ModelUnsetKeys.from_json(o) for o in keys or []]
+
+
 class ConstraintsResult(Type):
-    _toSchema = {'constraints': 'Constraints', 'error': 'Error'}
-    _toPy = {'Constraints': 'constraints', 'Error': 'error'}
+    _toSchema = {'constraints': 'constraints', 'error': 'error'}
+    _toPy = {'constraints': 'constraints', 'error': 'error'}
     def __init__(self, constraints=None, error=None):
         '''
         constraints : Value
@@ -3405,52 +4309,50 @@ class ConstraintsResult(Type):
 
 
 class ConstraintsResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ConstraintsResult]
+        results : typing.Sequence<+T_co>[~ConstraintsResult]<~ConstraintsResult>
         '''
         self.results = [ConstraintsResult.from_json(o) for o in results or []]
 
 
 class ContainerConfig(Type):
-    _toSchema = {'allowlxcloopmounts': 'AllowLXCLoopMounts', 'updatebehavior': 'UpdateBehavior', 'aptmirror': 'AptMirror', 'authorizedkeys': 'AuthorizedKeys', 'sslhostnameverification': 'SSLHostnameVerification', 'aptproxy': 'AptProxy', 'providertype': 'ProviderType', 'proxy': 'Proxy'}
-    _toPy = {'UpdateBehavior': 'updatebehavior', 'SSLHostnameVerification': 'sslhostnameverification', 'AptMirror': 'aptmirror', 'Proxy': 'proxy', 'AptProxy': 'aptproxy', 'AuthorizedKeys': 'authorizedkeys', 'AllowLXCLoopMounts': 'allowlxcloopmounts', 'ProviderType': 'providertype'}
-    def __init__(self, allowlxcloopmounts=None, aptmirror=None, aptproxy=None, authorizedkeys=None, providertype=None, proxy=None, sslhostnameverification=None, updatebehavior=None):
-        '''
-        allowlxcloopmounts : bool
-        aptmirror : str
-        aptproxy : Settings
-        authorizedkeys : str
-        providertype : str
-        proxy : Settings
-        sslhostnameverification : bool
+    _toSchema = {'apt_mirror': 'apt-mirror', 'apt_proxy': 'apt-proxy', 'authorized_keys': 'authorized-keys', 'provider_type': 'provider-type', 'proxy': 'proxy', 'ssl_hostname_verification': 'ssl-hostname-verification', 'updatebehavior': 'UpdateBehavior'}
+    _toPy = {'UpdateBehavior': 'updatebehavior', 'apt-mirror': 'apt_mirror', 'apt-proxy': 'apt_proxy', 'authorized-keys': 'authorized_keys', 'provider-type': 'provider_type', 'proxy': 'proxy', 'ssl-hostname-verification': 'ssl_hostname_verification'}
+    def __init__(self, updatebehavior=None, apt_mirror=None, apt_proxy=None, authorized_keys=None, provider_type=None, proxy=None, ssl_hostname_verification=None):
+        '''
         updatebehavior : UpdateBehavior
+        apt_mirror : str
+        apt_proxy : Settings
+        authorized_keys : str
+        provider_type : str
+        proxy : Settings
+        ssl_hostname_verification : bool
         '''
-        self.allowlxcloopmounts = allowlxcloopmounts
-        self.aptmirror = aptmirror
-        self.aptproxy = Settings.from_json(aptproxy) if aptproxy else None
-        self.authorizedkeys = authorizedkeys
-        self.providertype = providertype
-        self.proxy = Settings.from_json(proxy) if proxy else None
-        self.sslhostnameverification = sslhostnameverification
         self.updatebehavior = UpdateBehavior.from_json(updatebehavior) if updatebehavior else None
+        self.apt_mirror = apt_mirror
+        self.apt_proxy = Settings.from_json(apt_proxy) if apt_proxy else None
+        self.authorized_keys = authorized_keys
+        self.provider_type = provider_type
+        self.proxy = Settings.from_json(proxy) if proxy else None
+        self.ssl_hostname_verification = ssl_hostname_verification
 
 
 class ContainerManagerConfig(Type):
-    _toSchema = {'managerconfig': 'ManagerConfig'}
-    _toPy = {'ManagerConfig': 'managerconfig'}
-    def __init__(self, managerconfig=None):
+    _toSchema = {'config': 'config'}
+    _toPy = {'config': 'config'}
+    def __init__(self, config=None):
         '''
-        managerconfig : typing.Mapping[str, str]
+        config : typing.Mapping<~KT, +VT_co>[str, str]
         '''
-        self.managerconfig = managerconfig
+        self.config = config
 
 
 class ContainerManagerConfigParams(Type):
-    _toSchema = {'type_': 'Type'}
-    _toPy = {'Type': 'type_'}
+    _toSchema = {'type_': 'type'}
+    _toPy = {'type': 'type_'}
     def __init__(self, type_=None):
         '''
         type_ : str
@@ -3459,132 +4361,134 @@ class ContainerManagerConfigParams(Type):
 
 
 class DistributionGroupResult(Type):
-    _toSchema = {'result': 'Result', 'error': 'Error'}
-    _toPy = {'Result': 'result', 'Error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
-        result : typing.Sequence[str]
+        result : typing.Sequence<+T_co>[str]
         '''
         self.error = Error.from_json(error) if error else None
         self.result = result
 
 
 class DistributionGroupResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~DistributionGroupResult]
+        results : typing.Sequence<+T_co>[~DistributionGroupResult]<~DistributionGroupResult>
         '''
         self.results = [DistributionGroupResult.from_json(o) for o in results or []]
 
 
 class InstanceInfo(Type):
-    _toSchema = {'networkconfig': 'NetworkConfig', 'nonce': 'Nonce', 'characteristics': 'Characteristics', 'volumeattachments': 'VolumeAttachments', 'instanceid': 'InstanceId', 'tag': 'Tag', 'volumes': 'Volumes'}
-    _toPy = {'Characteristics': 'characteristics', 'InstanceId': 'instanceid', 'Volumes': 'volumes', 'Nonce': 'nonce', 'VolumeAttachments': 'volumeattachments', 'Tag': 'tag', 'NetworkConfig': 'networkconfig'}
-    def __init__(self, characteristics=None, instanceid=None, networkconfig=None, nonce=None, tag=None, volumeattachments=None, volumes=None):
+    _toSchema = {'characteristics': 'characteristics', 'instance_id': 'instance-id', 'network_config': 'network-config', 'nonce': 'nonce', 'tag': 'tag', 'volume_attachments': 'volume-attachments', 'volumes': 'volumes'}
+    _toPy = {'characteristics': 'characteristics', 'instance-id': 'instance_id', 'network-config': 'network_config', 'nonce': 'nonce', 'tag': 'tag', 'volume-attachments': 'volume_attachments', 'volumes': 'volumes'}
+    def __init__(self, characteristics=None, instance_id=None, network_config=None, nonce=None, tag=None, volume_attachments=None, volumes=None):
         '''
         characteristics : HardwareCharacteristics
-        instanceid : str
-        networkconfig : typing.Sequence[~NetworkConfig]
+        instance_id : str
+        network_config : typing.Sequence<+T_co>[~NetworkConfig]<~NetworkConfig>
         nonce : str
         tag : str
-        volumeattachments : typing.Mapping[str, ~VolumeAttachmentInfo]
-        volumes : typing.Sequence[~Volume]
+        volume_attachments : typing.Mapping<~KT, +VT_co>[str, ~VolumeAttachmentInfo]<~VolumeAttachmentInfo>
+        volumes : typing.Sequence<+T_co>[~Volume]<~Volume>
         '''
         self.characteristics = HardwareCharacteristics.from_json(characteristics) if characteristics else None
-        self.instanceid = instanceid
-        self.networkconfig = [NetworkConfig.from_json(o) for o in networkconfig or []]
+        self.instance_id = instance_id
+        self.network_config = [NetworkConfig.from_json(o) for o in network_config or []]
         self.nonce = nonce
         self.tag = tag
-        self.volumeattachments = {k: VolumeAttachmentInfo.from_json(v) for k, v in (volumeattachments or dict()).items()}
+        self.volume_attachments = volume_attachments
         self.volumes = [Volume.from_json(o) for o in volumes or []]
 
 
 class InstancesInfo(Type):
-    _toSchema = {'machines': 'Machines'}
-    _toPy = {'Machines': 'machines'}
+    _toSchema = {'machines': 'machines'}
+    _toPy = {'machines': 'machines'}
     def __init__(self, machines=None):
         '''
-        machines : typing.Sequence[~InstanceInfo]
+        machines : typing.Sequence<+T_co>[~InstanceInfo]<~InstanceInfo>
         '''
         self.machines = [InstanceInfo.from_json(o) for o in machines or []]
 
 
 class MachineContainers(Type):
-    _toSchema = {'containertypes': 'ContainerTypes', 'machinetag': 'MachineTag'}
-    _toPy = {'MachineTag': 'machinetag', 'ContainerTypes': 'containertypes'}
-    def __init__(self, containertypes=None, machinetag=None):
+    _toSchema = {'container_types': 'container-types', 'machine_tag': 'machine-tag'}
+    _toPy = {'container-types': 'container_types', 'machine-tag': 'machine_tag'}
+    def __init__(self, container_types=None, machine_tag=None):
         '''
-        containertypes : typing.Sequence[str]
-        machinetag : str
+        container_types : typing.Sequence<+T_co>[str]
+        machine_tag : str
         '''
-        self.containertypes = containertypes
-        self.machinetag = machinetag
+        self.container_types = container_types
+        self.machine_tag = machine_tag
 
 
 class MachineContainersParams(Type):
-    _toSchema = {'params': 'Params'}
-    _toPy = {'Params': 'params'}
+    _toSchema = {'params': 'params'}
+    _toPy = {'params': 'params'}
     def __init__(self, params=None):
         '''
-        params : typing.Sequence[~MachineContainers]
+        params : typing.Sequence<+T_co>[~MachineContainers]<~MachineContainers>
         '''
         self.params = [MachineContainers.from_json(o) for o in params or []]
 
 
 class MachineNetworkConfigResult(Type):
-    _toSchema = {'info': 'Info', 'error': 'Error'}
-    _toPy = {'Error': 'error', 'Info': 'info'}
+    _toSchema = {'error': 'error', 'info': 'info'}
+    _toPy = {'error': 'error', 'info': 'info'}
     def __init__(self, error=None, info=None):
         '''
         error : Error
-        info : typing.Sequence[~NetworkConfig]
+        info : typing.Sequence<+T_co>[~NetworkConfig]<~NetworkConfig>
         '''
         self.error = Error.from_json(error) if error else None
         self.info = [NetworkConfig.from_json(o) for o in info or []]
 
 
 class MachineNetworkConfigResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~MachineNetworkConfigResult]
+        results : typing.Sequence<+T_co>[~MachineNetworkConfigResult]<~MachineNetworkConfigResult>
         '''
         self.results = [MachineNetworkConfigResult.from_json(o) for o in results or []]
 
 
 class ProvisioningInfo(Type):
-    _toSchema = {'jobs': 'Jobs', 'series': 'Series', 'imagemetadata': 'ImageMetadata', 'placement': 'Placement', 'subnetstozones': 'SubnetsToZones', 'constraints': 'Constraints', 'tags': 'Tags', 'endpointbindings': 'EndpointBindings', 'volumes': 'Volumes'}
-    _toPy = {'Constraints': 'constraints', 'ImageMetadata': 'imagemetadata', 'SubnetsToZones': 'subnetstozones', 'Series': 'series', 'Volumes': 'volumes', 'Tags': 'tags', 'EndpointBindings': 'endpointbindings', 'Placement': 'placement', 'Jobs': 'jobs'}
-    def __init__(self, constraints=None, endpointbindings=None, imagemetadata=None, jobs=None, placement=None, series=None, subnetstozones=None, tags=None, volumes=None):
+    _toSchema = {'constraints': 'constraints', 'controller_config': 'controller-config', 'endpoint_bindings': 'endpoint-bindings', 'image_metadata': 'image-metadata', 'jobs': 'jobs', 'placement': 'placement', 'series': 'series', 'subnets_to_zones': 'subnets-to-zones', 'tags': 'tags', 'volumes': 'volumes'}
+    _toPy = {'constraints': 'constraints', 'controller-config': 'controller_config', 'endpoint-bindings': 'endpoint_bindings', 'image-metadata': 'image_metadata', 'jobs': 'jobs', 'placement': 'placement', 'series': 'series', 'subnets-to-zones': 'subnets_to_zones', 'tags': 'tags', 'volumes': 'volumes'}
+    def __init__(self, constraints=None, controller_config=None, endpoint_bindings=None, image_metadata=None, jobs=None, placement=None, series=None, subnets_to_zones=None, tags=None, volumes=None):
         '''
         constraints : Value
-        endpointbindings : typing.Mapping[str, str]
-        imagemetadata : typing.Sequence[~CloudImageMetadata]
-        jobs : typing.Sequence[str]
+        controller_config : typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        endpoint_bindings : typing.Mapping<~KT, +VT_co>[str, str]
+        image_metadata : typing.Sequence<+T_co>[~CloudImageMetadata]<~CloudImageMetadata>
+        jobs : typing.Sequence<+T_co>[str]
         placement : str
         series : str
-        subnetstozones : typing.Sequence[str]
-        tags : typing.Mapping[str, str]
-        volumes : typing.Sequence[~VolumeParams]
+        subnets_to_zones : typing.Sequence<+T_co>[str]
+        tags : typing.Mapping<~KT, +VT_co>[str, str]
+        volumes : typing.Sequence<+T_co>[~VolumeParams]<~VolumeParams>
         '''
         self.constraints = Value.from_json(constraints) if constraints else None
-        self.endpointbindings = endpointbindings
-        self.imagemetadata = [CloudImageMetadata.from_json(o) for o in imagemetadata or []]
+        self.controller_config = controller_config
+        self.endpoint_bindings = endpoint_bindings
+        self.image_metadata = [CloudImageMetadata.from_json(o) for o in image_metadata or []]
         self.jobs = jobs
         self.placement = placement
         self.series = series
-        self.subnetstozones = subnetstozones
+        self.subnets_to_zones = subnets_to_zones
         self.tags = tags
         self.volumes = [VolumeParams.from_json(o) for o in volumes or []]
 
 
 class ProvisioningInfoResult(Type):
-    _toSchema = {'result': 'Result', 'error': 'Error'}
-    _toPy = {'Result': 'result', 'Error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -3595,18 +4499,18 @@ class ProvisioningInfoResult(Type):
 
 
 class ProvisioningInfoResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
-    def __init__(self, results=None):
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
+    def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ProvisioningInfoResult]
+        results : typing.Sequence<+T_co>[~ProvisioningInfoResult]<~ProvisioningInfoResult>
         '''
         self.results = [ProvisioningInfoResult.from_json(o) for o in results or []]
 
 
 class Settings(Type):
-    _toSchema = {'ftp': 'Ftp', 'noproxy': 'NoProxy', 'http': 'Http', 'https': 'Https'}
-    _toPy = {'Http': 'http', 'Https': 'https', 'NoProxy': 'noproxy', 'Ftp': 'ftp'}
+    _toSchema = {'ftp': 'Ftp', 'http': 'Http', 'https': 'Https', 'noproxy': 'NoProxy'}
+    _toPy = {'Ftp': 'ftp', 'Http': 'http', 'Https': 'https', 'NoProxy': 'noproxy'}
     def __init__(self, ftp=None, http=None, https=None, noproxy=None):
         '''
         ftp : str
@@ -3621,190 +4525,190 @@ class Settings(Type):
 
 
 class ToolsResult(Type):
-    _toSchema = {'toolslist': 'ToolsList', 'disablesslhostnameverification': 'DisableSSLHostnameVerification', 'error': 'Error'}
-    _toPy = {'Error': 'error', 'DisableSSLHostnameVerification': 'disablesslhostnameverification', 'ToolsList': 'toolslist'}
-    def __init__(self, disablesslhostnameverification=None, error=None, toolslist=None):
+    _toSchema = {'disable_ssl_hostname_verification': 'disable-ssl-hostname-verification', 'error': 'error', 'tools': 'tools'}
+    _toPy = {'disable-ssl-hostname-verification': 'disable_ssl_hostname_verification', 'error': 'error', 'tools': 'tools'}
+    def __init__(self, disable_ssl_hostname_verification=None, error=None, tools=None):
         '''
-        disablesslhostnameverification : bool
+        disable_ssl_hostname_verification : bool
         error : Error
-        toolslist : typing.Sequence[~Tools]
+        tools : typing.Sequence<+T_co>[~Tools]<~Tools>
         '''
-        self.disablesslhostnameverification = disablesslhostnameverification
+        self.disable_ssl_hostname_verification = disable_ssl_hostname_verification
         self.error = Error.from_json(error) if error else None
-        self.toolslist = [Tools.from_json(o) for o in toolslist or []]
+        self.tools = [Tools.from_json(o) for o in tools or []]
 
 
 class ToolsResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ToolsResult]
+        results : typing.Sequence<+T_co>[~ToolsResult]<~ToolsResult>
         '''
         self.results = [ToolsResult.from_json(o) for o in results or []]
 
 
 class UpdateBehavior(Type):
-    _toSchema = {'enableosupgrade': 'EnableOSUpgrade', 'enableosrefreshupdate': 'EnableOSRefreshUpdate'}
-    _toPy = {'EnableOSRefreshUpdate': 'enableosrefreshupdate', 'EnableOSUpgrade': 'enableosupgrade'}
-    def __init__(self, enableosrefreshupdate=None, enableosupgrade=None):
+    _toSchema = {'enable_os_refresh_update': 'enable-os-refresh-update', 'enable_os_upgrade': 'enable-os-upgrade'}
+    _toPy = {'enable-os-refresh-update': 'enable_os_refresh_update', 'enable-os-upgrade': 'enable_os_upgrade'}
+    def __init__(self, enable_os_refresh_update=None, enable_os_upgrade=None):
         '''
-        enableosrefreshupdate : bool
-        enableosupgrade : bool
+        enable_os_refresh_update : bool
+        enable_os_upgrade : bool
         '''
-        self.enableosrefreshupdate = enableosrefreshupdate
-        self.enableosupgrade = enableosupgrade
+        self.enable_os_refresh_update = enable_os_refresh_update
+        self.enable_os_upgrade = enable_os_upgrade
 
 
 class Volume(Type):
-    _toSchema = {'volumetag': 'volumetag', 'info': 'info'}
-    _toPy = {'volumetag': 'volumetag', 'info': 'info'}
-    def __init__(self, info=None, volumetag=None):
+    _toSchema = {'info': 'info', 'volume_tag': 'volume-tag'}
+    _toPy = {'info': 'info', 'volume-tag': 'volume_tag'}
+    def __init__(self, info=None, volume_tag=None):
         '''
         info : VolumeInfo
-        volumetag : str
+        volume_tag : str
         '''
         self.info = VolumeInfo.from_json(info) if info else None
-        self.volumetag = volumetag
+        self.volume_tag = volume_tag
 
 
 class VolumeAttachmentInfo(Type):
-    _toSchema = {'read_only': 'read-only', 'devicelink': 'devicelink', 'busaddress': 'busaddress', 'devicename': 'devicename'}
-    _toPy = {'devicelink': 'devicelink', 'busaddress': 'busaddress', 'devicename': 'devicename', 'read-only': 'read_only'}
-    def __init__(self, busaddress=None, devicelink=None, devicename=None, read_only=None):
+    _toSchema = {'bus_address': 'bus-address', 'device_link': 'device-link', 'device_name': 'device-name', 'read_only': 'read-only'}
+    _toPy = {'bus-address': 'bus_address', 'device-link': 'device_link', 'device-name': 'device_name', 'read-only': 'read_only'}
+    def __init__(self, bus_address=None, device_link=None, device_name=None, read_only=None):
         '''
-        busaddress : str
-        devicelink : str
-        devicename : str
+        bus_address : str
+        device_link : str
+        device_name : str
         read_only : bool
         '''
-        self.busaddress = busaddress
-        self.devicelink = devicelink
-        self.devicename = devicename
+        self.bus_address = bus_address
+        self.device_link = device_link
+        self.device_name = device_name
         self.read_only = read_only
 
 
 class VolumeAttachmentParams(Type):
-    _toSchema = {'volumetag': 'volumetag', 'read_only': 'read-only', 'provider': 'provider', 'volumeid': 'volumeid', 'instanceid': 'instanceid', 'machinetag': 'machinetag'}
-    _toPy = {'volumetag': 'volumetag', 'provider': 'provider', 'read-only': 'read_only', 'volumeid': 'volumeid', 'instanceid': 'instanceid', 'machinetag': 'machinetag'}
-    def __init__(self, instanceid=None, machinetag=None, provider=None, read_only=None, volumeid=None, volumetag=None):
+    _toSchema = {'instance_id': 'instance-id', 'machine_tag': 'machine-tag', 'provider': 'provider', 'read_only': 'read-only', 'volume_id': 'volume-id', 'volume_tag': 'volume-tag'}
+    _toPy = {'instance-id': 'instance_id', 'machine-tag': 'machine_tag', 'provider': 'provider', 'read-only': 'read_only', 'volume-id': 'volume_id', 'volume-tag': 'volume_tag'}
+    def __init__(self, instance_id=None, machine_tag=None, provider=None, read_only=None, volume_id=None, volume_tag=None):
         '''
-        instanceid : str
-        machinetag : str
+        instance_id : str
+        machine_tag : str
         provider : str
         read_only : bool
-        volumeid : str
-        volumetag : str
+        volume_id : str
+        volume_tag : str
         '''
-        self.instanceid = instanceid
-        self.machinetag = machinetag
+        self.instance_id = instance_id
+        self.machine_tag = machine_tag
         self.provider = provider
         self.read_only = read_only
-        self.volumeid = volumeid
-        self.volumetag = volumetag
+        self.volume_id = volume_id
+        self.volume_tag = volume_tag
 
 
 class VolumeInfo(Type):
-    _toSchema = {'hardwareid': 'hardwareid', 'persistent': 'persistent', 'size': 'size', 'volumeid': 'volumeid'}
-    _toPy = {'hardwareid': 'hardwareid', 'persistent': 'persistent', 'size': 'size', 'volumeid': 'volumeid'}
-    def __init__(self, hardwareid=None, persistent=None, size=None, volumeid=None):
+    _toSchema = {'hardware_id': 'hardware-id', 'persistent': 'persistent', 'size': 'size', 'volume_id': 'volume-id'}
+    _toPy = {'hardware-id': 'hardware_id', 'persistent': 'persistent', 'size': 'size', 'volume-id': 'volume_id'}
+    def __init__(self, hardware_id=None, persistent=None, size=None, volume_id=None):
         '''
-        hardwareid : str
+        hardware_id : str
         persistent : bool
         size : int
-        volumeid : str
+        volume_id : str
         '''
-        self.hardwareid = hardwareid
+        self.hardware_id = hardware_id
         self.persistent = persistent
         self.size = size
-        self.volumeid = volumeid
+        self.volume_id = volume_id
 
 
 class VolumeParams(Type):
-    _toSchema = {'attachment': 'attachment', 'attributes': 'attributes', 'size': 'size', 'volumetag': 'volumetag', 'tags': 'tags', 'provider': 'provider'}
-    _toPy = {'attachment': 'attachment', 'attributes': 'attributes', 'size': 'size', 'volumetag': 'volumetag', 'tags': 'tags', 'provider': 'provider'}
-    def __init__(self, attachment=None, attributes=None, provider=None, size=None, tags=None, volumetag=None):
+    _toSchema = {'attachment': 'attachment', 'attributes': 'attributes', 'provider': 'provider', 'size': 'size', 'tags': 'tags', 'volume_tag': 'volume-tag'}
+    _toPy = {'attachment': 'attachment', 'attributes': 'attributes', 'provider': 'provider', 'size': 'size', 'tags': 'tags', 'volume-tag': 'volume_tag'}
+    def __init__(self, attachment=None, attributes=None, provider=None, size=None, tags=None, volume_tag=None):
         '''
         attachment : VolumeAttachmentParams
-        attributes : typing.Mapping[str, typing.Any]
+        attributes : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         provider : str
         size : int
-        tags : typing.Mapping[str, str]
-        volumetag : str
+        tags : typing.Mapping<~KT, +VT_co>[str, str]
+        volume_tag : str
         '''
         self.attachment = VolumeAttachmentParams.from_json(attachment) if attachment else None
         self.attributes = attributes
         self.provider = provider
         self.size = size
         self.tags = tags
-        self.volumetag = volumetag
+        self.volume_tag = volume_tag
 
 
 class WatchContainer(Type):
-    _toSchema = {'machinetag': 'MachineTag', 'containertype': 'ContainerType'}
-    _toPy = {'MachineTag': 'machinetag', 'ContainerType': 'containertype'}
-    def __init__(self, containertype=None, machinetag=None):
+    _toSchema = {'container_type': 'container-type', 'machine_tag': 'machine-tag'}
+    _toPy = {'container-type': 'container_type', 'machine-tag': 'machine_tag'}
+    def __init__(self, container_type=None, machine_tag=None):
         '''
-        containertype : str
-        machinetag : str
+        container_type : str
+        machine_tag : str
         '''
-        self.containertype = containertype
-        self.machinetag = machinetag
+        self.container_type = container_type
+        self.machine_tag = machine_tag
 
 
 class WatchContainers(Type):
-    _toSchema = {'params': 'Params'}
-    _toPy = {'Params': 'params'}
+    _toSchema = {'params': 'params'}
+    _toPy = {'params': 'params'}
     def __init__(self, params=None):
         '''
-        params : typing.Sequence[~WatchContainer]
+        params : typing.Sequence<+T_co>[~WatchContainer]<~WatchContainer>
         '''
         self.params = [WatchContainer.from_json(o) for o in params or []]
 
 
 class ProxyConfig(Type):
-    _toSchema = {'ftp': 'FTP', 'noproxy': 'NoProxy', 'http': 'HTTP', 'https': 'HTTPS'}
-    _toPy = {'NoProxy': 'noproxy', 'FTP': 'ftp', 'HTTPS': 'https', 'HTTP': 'http'}
-    def __init__(self, ftp=None, http=None, https=None, noproxy=None):
+    _toSchema = {'ftp': 'ftp', 'http': 'http', 'https': 'https', 'no_proxy': 'no-proxy'}
+    _toPy = {'ftp': 'ftp', 'http': 'http', 'https': 'https', 'no-proxy': 'no_proxy'}
+    def __init__(self, ftp=None, http=None, https=None, no_proxy=None):
         '''
         ftp : str
         http : str
         https : str
-        noproxy : str
+        no_proxy : str
         '''
         self.ftp = ftp
         self.http = http
         self.https = https
-        self.noproxy = noproxy
+        self.no_proxy = no_proxy
 
 
 class ProxyConfigResult(Type):
-    _toSchema = {'proxysettings': 'ProxySettings', 'aptproxysettings': 'APTProxySettings', 'error': 'Error'}
-    _toPy = {'ProxySettings': 'proxysettings', 'APTProxySettings': 'aptproxysettings', 'Error': 'error'}
-    def __init__(self, aptproxysettings=None, error=None, proxysettings=None):
+    _toSchema = {'apt_proxy_settings': 'apt-proxy-settings', 'error': 'error', 'proxy_settings': 'proxy-settings'}
+    _toPy = {'apt-proxy-settings': 'apt_proxy_settings', 'error': 'error', 'proxy-settings': 'proxy_settings'}
+    def __init__(self, apt_proxy_settings=None, error=None, proxy_settings=None):
         '''
-        aptproxysettings : ProxyConfig
+        apt_proxy_settings : ProxyConfig
         error : Error
-        proxysettings : ProxyConfig
+        proxy_settings : ProxyConfig
         '''
-        self.aptproxysettings = ProxyConfig.from_json(aptproxysettings) if aptproxysettings else None
+        self.apt_proxy_settings = ProxyConfig.from_json(apt_proxy_settings) if apt_proxy_settings else None
         self.error = Error.from_json(error) if error else None
-        self.proxysettings = ProxyConfig.from_json(proxysettings) if proxysettings else None
+        self.proxy_settings = ProxyConfig.from_json(proxy_settings) if proxy_settings else None
 
 
 class ProxyConfigResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ProxyConfigResult]
+        results : typing.Sequence<+T_co>[~ProxyConfigResult]<~ProxyConfigResult>
         '''
         self.results = [ProxyConfigResult.from_json(o) for o in results or []]
 
 
 class RebootActionResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -3819,40 +4723,40 @@ class RebootActionResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~RebootActionResult]
+        results : typing.Sequence<+T_co>[~RebootActionResult]<~RebootActionResult>
         '''
         self.results = [RebootActionResult.from_json(o) for o in results or []]
 
 
 class RelationUnitsChange(Type):
-    _toSchema = {'departed': 'Departed', 'changed': 'Changed'}
-    _toPy = {'Changed': 'changed', 'Departed': 'departed'}
+    _toSchema = {'changed': 'changed', 'departed': 'departed'}
+    _toPy = {'changed': 'changed', 'departed': 'departed'}
     def __init__(self, changed=None, departed=None):
         '''
-        changed : typing.Mapping[str, ~UnitSettings]
-        departed : typing.Sequence[str]
+        changed : typing.Mapping<~KT, +VT_co>[str, ~UnitSettings]<~UnitSettings>
+        departed : typing.Sequence<+T_co>[str]
         '''
-        self.changed = {k: UnitSettings.from_json(v) for k, v in (changed or dict()).items()}
+        self.changed = changed
         self.departed = departed
 
 
 class RelationUnitsWatchResult(Type):
-    _toSchema = {'changes': 'Changes', 'relationunitswatcherid': 'RelationUnitsWatcherId', 'error': 'Error'}
-    _toPy = {'Changes': 'changes', 'RelationUnitsWatcherId': 'relationunitswatcherid', 'Error': 'error'}
-    def __init__(self, changes=None, error=None, relationunitswatcherid=None):
+    _toSchema = {'changes': 'changes', 'error': 'error', 'watcher_id': 'watcher-id'}
+    _toPy = {'changes': 'changes', 'error': 'error', 'watcher-id': 'watcher_id'}
+    def __init__(self, changes=None, error=None, watcher_id=None):
         '''
         changes : RelationUnitsChange
         error : Error
-        relationunitswatcherid : str
+        watcher_id : str
         '''
         self.changes = RelationUnitsChange.from_json(changes) if changes else None
         self.error = Error.from_json(error) if error else None
-        self.relationunitswatcherid = relationunitswatcherid
+        self.watcher_id = watcher_id
 
 
 class UnitSettings(Type):
-    _toSchema = {'version': 'Version'}
-    _toPy = {'Version': 'version'}
+    _toSchema = {'version': 'version'}
+    _toPy = {'version': 'version'}
     def __init__(self, version=None):
         '''
         version : int
@@ -3861,26 +4765,26 @@ class UnitSettings(Type):
 
 
 class RetryStrategy(Type):
-    _toSchema = {'jitterretrytime': 'JitterRetryTime', 'shouldretry': 'ShouldRetry', 'minretrytime': 'MinRetryTime', 'retrytimefactor': 'RetryTimeFactor', 'maxretrytime': 'MaxRetryTime'}
-    _toPy = {'MinRetryTime': 'minretrytime', 'JitterRetryTime': 'jitterretrytime', 'RetryTimeFactor': 'retrytimefactor', 'MaxRetryTime': 'maxretrytime', 'ShouldRetry': 'shouldretry'}
-    def __init__(self, jitterretrytime=None, maxretrytime=None, minretrytime=None, retrytimefactor=None, shouldretry=None):
+    _toSchema = {'jitter_retry_time': 'jitter-retry-time', 'max_retry_time': 'max-retry-time', 'min_retry_time': 'min-retry-time', 'retry_time_factor': 'retry-time-factor', 'should_retry': 'should-retry'}
+    _toPy = {'jitter-retry-time': 'jitter_retry_time', 'max-retry-time': 'max_retry_time', 'min-retry-time': 'min_retry_time', 'retry-time-factor': 'retry_time_factor', 'should-retry': 'should_retry'}
+    def __init__(self, jitter_retry_time=None, max_retry_time=None, min_retry_time=None, retry_time_factor=None, should_retry=None):
         '''
-        jitterretrytime : bool
-        maxretrytime : int
-        minretrytime : int
-        retrytimefactor : int
-        shouldretry : bool
+        jitter_retry_time : bool
+        max_retry_time : int
+        min_retry_time : int
+        retry_time_factor : int
+        should_retry : bool
         '''
-        self.jitterretrytime = jitterretrytime
-        self.maxretrytime = maxretrytime
-        self.minretrytime = minretrytime
-        self.retrytimefactor = retrytimefactor
-        self.shouldretry = shouldretry
+        self.jitter_retry_time = jitter_retry_time
+        self.max_retry_time = max_retry_time
+        self.min_retry_time = min_retry_time
+        self.retry_time_factor = retry_time_factor
+        self.should_retry = should_retry
 
 
 class RetryStrategyResult(Type):
-    _toSchema = {'result': 'Result', 'error': 'Error'}
-    _toPy = {'Result': 'result', 'Error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -3891,11 +4795,11 @@ class RetryStrategyResult(Type):
 
 
 class RetryStrategyResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~RetryStrategyResult]
+        results : typing.Sequence<+T_co>[~RetryStrategyResult]<~RetryStrategyResult>
         '''
         self.results = [RetryStrategyResult.from_json(o) for o in results or []]
 
@@ -3917,11 +4821,33 @@ class SSHAddressResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~SSHAddressResult]
+        results : typing.Sequence<+T_co>[~SSHAddressResult]<~SSHAddressResult>
         '''
         self.results = [SSHAddressResult.from_json(o) for o in results or []]
 
 
+class SSHAddressesResult(Type):
+    _toSchema = {'addresses': 'addresses', 'error': 'error'}
+    _toPy = {'addresses': 'addresses', 'error': 'error'}
+    def __init__(self, addresses=None, error=None):
+        '''
+        addresses : typing.Sequence<+T_co>[str]
+        error : Error
+        '''
+        self.addresses = addresses
+        self.error = Error.from_json(error) if error else None
+
+
+class SSHAddressesResults(Type):
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
+    def __init__(self, results=None):
+        '''
+        results : typing.Sequence<+T_co>[~SSHAddressesResult]<~SSHAddressesResult>
+        '''
+        self.results = [SSHAddressesResult.from_json(o) for o in results or []]
+
+
 class SSHProxyResult(Type):
     _toSchema = {'use_proxy': 'use-proxy'}
     _toPy = {'use-proxy': 'use_proxy'}
@@ -3933,12 +4859,12 @@ class SSHProxyResult(Type):
 
 
 class SSHPublicKeysResult(Type):
-    _toSchema = {'public_keys': 'public-keys', 'error': 'error'}
-    _toPy = {'public-keys': 'public_keys', 'error': 'error'}
+    _toSchema = {'error': 'error', 'public_keys': 'public-keys'}
+    _toPy = {'error': 'error', 'public-keys': 'public_keys'}
     def __init__(self, error=None, public_keys=None):
         '''
         error : Error
-        public_keys : typing.Sequence[str]
+        public_keys : typing.Sequence<+T_co>[str]
         '''
         self.error = Error.from_json(error) if error else None
         self.public_keys = public_keys
@@ -3949,53 +4875,53 @@ class SSHPublicKeysResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~SSHPublicKeysResult]
+        results : typing.Sequence<+T_co>[~SSHPublicKeysResult]<~SSHPublicKeysResult>
         '''
         self.results = [SSHPublicKeysResult.from_json(o) for o in results or []]
 
 
 class SingularClaim(Type):
-    _toSchema = {'controllertag': 'ControllerTag', 'duration': 'Duration', 'modeltag': 'ModelTag'}
-    _toPy = {'ModelTag': 'modeltag', 'ControllerTag': 'controllertag', 'Duration': 'duration'}
-    def __init__(self, controllertag=None, duration=None, modeltag=None):
+    _toSchema = {'controller_tag': 'controller-tag', 'duration': 'duration', 'model_tag': 'model-tag'}
+    _toPy = {'controller-tag': 'controller_tag', 'duration': 'duration', 'model-tag': 'model_tag'}
+    def __init__(self, controller_tag=None, duration=None, model_tag=None):
         '''
-        controllertag : str
+        controller_tag : str
         duration : int
-        modeltag : str
+        model_tag : str
         '''
-        self.controllertag = controllertag
+        self.controller_tag = controller_tag
         self.duration = duration
-        self.modeltag = modeltag
+        self.model_tag = model_tag
 
 
 class SingularClaims(Type):
-    _toSchema = {'claims': 'Claims'}
-    _toPy = {'Claims': 'claims'}
+    _toSchema = {'claims': 'claims'}
+    _toPy = {'claims': 'claims'}
     def __init__(self, claims=None):
         '''
-        claims : typing.Sequence[~SingularClaim]
+        claims : typing.Sequence<+T_co>[~SingularClaim]<~SingularClaim>
         '''
         self.claims = [SingularClaim.from_json(o) for o in claims or []]
 
 
 class ListSpacesResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~Space]
+        results : typing.Sequence<+T_co>[~Space]<~Space>
         '''
         self.results = [Space.from_json(o) for o in results or []]
 
 
 class Space(Type):
-    _toSchema = {'subnets': 'Subnets', 'error': 'Error', 'name': 'Name'}
-    _toPy = {'Subnets': 'subnets', 'Error': 'error', 'Name': 'name'}
+    _toSchema = {'error': 'error', 'name': 'name', 'subnets': 'subnets'}
+    _toPy = {'error': 'error', 'name': 'name', 'subnets': 'subnets'}
     def __init__(self, error=None, name=None, subnets=None):
         '''
         error : Error
         name : str
-        subnets : typing.Sequence[~Subnet]
+        subnets : typing.Sequence<+T_co>[~Subnet]<~Subnet>
         '''
         self.error = Error.from_json(error) if error else None
         self.name = name
@@ -4003,56 +4929,56 @@ class Space(Type):
 
 
 class StatusHistoryPruneArgs(Type):
-    _toSchema = {'maxhistorytime': 'MaxHistoryTime', 'maxhistorymb': 'MaxHistoryMB'}
-    _toPy = {'MaxHistoryTime': 'maxhistorytime', 'MaxHistoryMB': 'maxhistorymb'}
-    def __init__(self, maxhistorymb=None, maxhistorytime=None):
+    _toSchema = {'max_history_mb': 'max-history-mb', 'max_history_time': 'max-history-time'}
+    _toPy = {'max-history-mb': 'max_history_mb', 'max-history-time': 'max_history_time'}
+    def __init__(self, max_history_mb=None, max_history_time=None):
         '''
-        maxhistorymb : int
-        maxhistorytime : int
+        max_history_mb : int
+        max_history_time : int
         '''
-        self.maxhistorymb = maxhistorymb
-        self.maxhistorytime = maxhistorytime
+        self.max_history_mb = max_history_mb
+        self.max_history_time = max_history_time
 
 
 class FilesystemAttachmentInfo(Type):
-    _toSchema = {'mountpoint': 'mountpoint', 'read_only': 'read-only'}
-    _toPy = {'mountpoint': 'mountpoint', 'read-only': 'read_only'}
-    def __init__(self, mountpoint=None, read_only=None):
+    _toSchema = {'mount_point': 'mount-point', 'read_only': 'read-only'}
+    _toPy = {'mount-point': 'mount_point', 'read-only': 'read_only'}
+    def __init__(self, mount_point=None, read_only=None):
         '''
-        mountpoint : str
+        mount_point : str
         read_only : bool
         '''
-        self.mountpoint = mountpoint
+        self.mount_point = mount_point
         self.read_only = read_only
 
 
 class FilesystemDetails(Type):
-    _toSchema = {'machineattachments': 'machineattachments', 'info': 'info', 'volumetag': 'volumetag', 'filesystemtag': 'filesystemtag', 'storage': 'storage', 'status': 'status'}
-    _toPy = {'machineattachments': 'machineattachments', 'info': 'info', 'volumetag': 'volumetag', 'filesystemtag': 'filesystemtag', 'storage': 'storage', 'status': 'status'}
-    def __init__(self, filesystemtag=None, info=None, machineattachments=None, status=None, storage=None, volumetag=None):
+    _toSchema = {'filesystem_tag': 'filesystem-tag', 'info': 'info', 'machine_attachments': 'machine-attachments', 'status': 'status', 'storage': 'storage', 'volume_tag': 'volume-tag'}
+    _toPy = {'filesystem-tag': 'filesystem_tag', 'info': 'info', 'machine-attachments': 'machine_attachments', 'status': 'status', 'storage': 'storage', 'volume-tag': 'volume_tag'}
+    def __init__(self, filesystem_tag=None, info=None, machine_attachments=None, status=None, storage=None, volume_tag=None):
         '''
-        filesystemtag : str
+        filesystem_tag : str
         info : FilesystemInfo
-        machineattachments : typing.Mapping[str, ~FilesystemAttachmentInfo]
+        machine_attachments : typing.Mapping<~KT, +VT_co>[str, ~FilesystemAttachmentInfo]<~FilesystemAttachmentInfo>
         status : EntityStatus
         storage : StorageDetails
-        volumetag : str
+        volume_tag : str
         '''
-        self.filesystemtag = filesystemtag
+        self.filesystem_tag = filesystem_tag
         self.info = FilesystemInfo.from_json(info) if info else None
-        self.machineattachments = {k: FilesystemAttachmentInfo.from_json(v) for k, v in (machineattachments or dict()).items()}
+        self.machine_attachments = machine_attachments
         self.status = EntityStatus.from_json(status) if status else None
         self.storage = StorageDetails.from_json(storage) if storage else None
-        self.volumetag = volumetag
+        self.volume_tag = volume_tag
 
 
 class FilesystemDetailsListResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
-        result : typing.Sequence[~FilesystemDetails]
+        result : typing.Sequence<+T_co>[~FilesystemDetails]<~FilesystemDetails>
         '''
         self.error = Error.from_json(error) if error else None
         self.result = [FilesystemDetails.from_json(o) for o in result or []]
@@ -4063,7 +4989,7 @@ class FilesystemDetailsListResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~FilesystemDetailsListResult]
+        results : typing.Sequence<+T_co>[~FilesystemDetailsListResult]<~FilesystemDetailsListResult>
         '''
         self.results = [FilesystemDetailsListResult.from_json(o) for o in results or []]
 
@@ -4073,7 +4999,7 @@ class FilesystemFilter(Type):
     _toPy = {'machines': 'machines'}
     def __init__(self, machines=None):
         '''
-        machines : typing.Sequence[str]
+        machines : typing.Sequence<+T_co>[str]
         '''
         self.machines = machines
 
@@ -4083,94 +5009,80 @@ class FilesystemFilters(Type):
     _toPy = {'filters': 'filters'}
     def __init__(self, filters=None):
         '''
-        filters : typing.Sequence[~FilesystemFilter]
+        filters : typing.Sequence<+T_co>[~FilesystemFilter]<~FilesystemFilter>
         '''
         self.filters = [FilesystemFilter.from_json(o) for o in filters or []]
 
 
 class FilesystemInfo(Type):
-    _toSchema = {'filesystemid': 'filesystemid', 'size': 'size'}
-    _toPy = {'filesystemid': 'filesystemid', 'size': 'size'}
-    def __init__(self, filesystemid=None, size=None):
+    _toSchema = {'filesystem_id': 'filesystem-id', 'size': 'size'}
+    _toPy = {'filesystem-id': 'filesystem_id', 'size': 'size'}
+    def __init__(self, filesystem_id=None, size=None):
         '''
-        filesystemid : str
+        filesystem_id : str
         size : int
         '''
-        self.filesystemid = filesystemid
+        self.filesystem_id = filesystem_id
         self.size = size
 
 
 class StorageAddParams(Type):
-    _toSchema = {'storage': 'storage', 'storagename': 'StorageName', 'unit': 'unit'}
-    _toPy = {'StorageName': 'storagename', 'storage': 'storage', 'unit': 'unit'}
-    def __init__(self, storagename=None, storage=None, unit=None):
+    _toSchema = {'name': 'name', 'storage': 'storage', 'unit': 'unit'}
+    _toPy = {'name': 'name', 'storage': 'storage', 'unit': 'unit'}
+    def __init__(self, name=None, storage=None, unit=None):
         '''
-        storagename : str
+        name : str
         storage : StorageConstraints
         unit : str
         '''
-        self.storagename = storagename
+        self.name = name
         self.storage = StorageConstraints.from_json(storage) if storage else None
         self.unit = unit
 
 
 class StorageAttachmentDetails(Type):
-    _toSchema = {'unittag': 'unittag', 'storagetag': 'storagetag', 'location': 'location', 'machinetag': 'machinetag'}
-    _toPy = {'unittag': 'unittag', 'storagetag': 'storagetag', 'location': 'location', 'machinetag': 'machinetag'}
-    def __init__(self, location=None, machinetag=None, storagetag=None, unittag=None):
+    _toSchema = {'location': 'location', 'machine_tag': 'machine-tag', 'storage_tag': 'storage-tag', 'unit_tag': 'unit-tag'}
+    _toPy = {'location': 'location', 'machine-tag': 'machine_tag', 'storage-tag': 'storage_tag', 'unit-tag': 'unit_tag'}
+    def __init__(self, location=None, machine_tag=None, storage_tag=None, unit_tag=None):
         '''
         location : str
-        machinetag : str
-        storagetag : str
-        unittag : str
+        machine_tag : str
+        storage_tag : str
+        unit_tag : str
         '''
         self.location = location
-        self.machinetag = machinetag
-        self.storagetag = storagetag
-        self.unittag = unittag
-
-
-class StorageConstraints(Type):
-    _toSchema = {'pool': 'Pool', 'size': 'Size', 'count': 'Count'}
-    _toPy = {'Count': 'count', 'Pool': 'pool', 'Size': 'size'}
-    def __init__(self, count=None, pool=None, size=None):
-        '''
-        count : int
-        pool : str
-        size : int
-        '''
-        self.count = count
-        self.pool = pool
-        self.size = size
+        self.machine_tag = machine_tag
+        self.storage_tag = storage_tag
+        self.unit_tag = unit_tag
 
 
 class StorageDetails(Type):
-    _toSchema = {'persistent': 'Persistent', 'storagetag': 'storagetag', 'kind': 'kind', 'ownertag': 'ownertag', 'attachments': 'attachments', 'status': 'status'}
-    _toPy = {'storagetag': 'storagetag', 'kind': 'kind', 'Persistent': 'persistent', 'ownertag': 'ownertag', 'attachments': 'attachments', 'status': 'status'}
-    def __init__(self, persistent=None, attachments=None, kind=None, ownertag=None, status=None, storagetag=None):
+    _toSchema = {'attachments': 'attachments', 'kind': 'kind', 'owner_tag': 'owner-tag', 'persistent': 'persistent', 'status': 'status', 'storage_tag': 'storage-tag'}
+    _toPy = {'attachments': 'attachments', 'kind': 'kind', 'owner-tag': 'owner_tag', 'persistent': 'persistent', 'status': 'status', 'storage-tag': 'storage_tag'}
+    def __init__(self, attachments=None, kind=None, owner_tag=None, persistent=None, status=None, storage_tag=None):
         '''
-        persistent : bool
-        attachments : typing.Mapping[str, ~StorageAttachmentDetails]
+        attachments : typing.Mapping<~KT, +VT_co>[str, ~StorageAttachmentDetails]<~StorageAttachmentDetails>
         kind : int
-        ownertag : str
+        owner_tag : str
+        persistent : bool
         status : EntityStatus
-        storagetag : str
+        storage_tag : str
         '''
-        self.persistent = persistent
-        self.attachments = {k: StorageAttachmentDetails.from_json(v) for k, v in (attachments or dict()).items()}
+        self.attachments = attachments
         self.kind = kind
-        self.ownertag = ownertag
+        self.owner_tag = owner_tag
+        self.persistent = persistent
         self.status = EntityStatus.from_json(status) if status else None
-        self.storagetag = storagetag
+        self.storage_tag = storage_tag
 
 
 class StorageDetailsListResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
-        result : typing.Sequence[~StorageDetails]
+        result : typing.Sequence<+T_co>[~StorageDetails]<~StorageDetails>
         '''
         self.error = Error.from_json(error) if error else None
         self.result = [StorageDetails.from_json(o) for o in result or []]
@@ -4181,14 +5093,14 @@ class StorageDetailsListResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~StorageDetailsListResult]
+        results : typing.Sequence<+T_co>[~StorageDetailsListResult]<~StorageDetailsListResult>
         '''
         self.results = [StorageDetailsListResult.from_json(o) for o in results or []]
 
 
 class StorageDetailsResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -4203,7 +5115,7 @@ class StorageDetailsResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~StorageDetailsResult]
+        results : typing.Sequence<+T_co>[~StorageDetailsResult]<~StorageDetailsResult>
         '''
         self.results = [StorageDetailsResult.from_json(o) for o in results or []]
 
@@ -4223,17 +5135,17 @@ class StorageFilters(Type):
     _toPy = {'filters': 'filters'}
     def __init__(self, filters=None):
         '''
-        filters : typing.Sequence[~StorageFilter]
+        filters : typing.Sequence<+T_co>[~StorageFilter]<~StorageFilter>
         '''
         self.filters = [StorageFilter.from_json(o) for o in filters or []]
 
 
 class StoragePool(Type):
-    _toSchema = {'provider': 'provider', 'attrs': 'attrs', 'name': 'name'}
-    _toPy = {'provider': 'provider', 'attrs': 'attrs', 'name': 'name'}
+    _toSchema = {'attrs': 'attrs', 'name': 'name', 'provider': 'provider'}
+    _toPy = {'attrs': 'attrs', 'name': 'name', 'provider': 'provider'}
     def __init__(self, attrs=None, name=None, provider=None):
         '''
-        attrs : typing.Mapping[str, typing.Any]
+        attrs : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         name : str
         provider : str
         '''
@@ -4243,12 +5155,12 @@ class StoragePool(Type):
 
 
 class StoragePoolFilter(Type):
-    _toSchema = {'providers': 'providers', 'names': 'names'}
-    _toPy = {'providers': 'providers', 'names': 'names'}
+    _toSchema = {'names': 'names', 'providers': 'providers'}
+    _toPy = {'names': 'names', 'providers': 'providers'}
     def __init__(self, names=None, providers=None):
         '''
-        names : typing.Sequence[str]
-        providers : typing.Sequence[str]
+        names : typing.Sequence<+T_co>[str]
+        providers : typing.Sequence<+T_co>[str]
         '''
         self.names = names
         self.providers = providers
@@ -4259,21 +5171,21 @@ class StoragePoolFilters(Type):
     _toPy = {'filters': 'filters'}
     def __init__(self, filters=None):
         '''
-        filters : typing.Sequence[~StoragePoolFilter]
+        filters : typing.Sequence<+T_co>[~StoragePoolFilter]<~StoragePoolFilter>
         '''
         self.filters = [StoragePoolFilter.from_json(o) for o in filters or []]
 
 
 class StoragePoolsResult(Type):
-    _toSchema = {'error': 'error', 'storagepools': 'storagepools'}
-    _toPy = {'error': 'error', 'storagepools': 'storagepools'}
-    def __init__(self, error=None, storagepools=None):
+    _toSchema = {'error': 'error', 'storage_pools': 'storage-pools'}
+    _toPy = {'error': 'error', 'storage-pools': 'storage_pools'}
+    def __init__(self, error=None, storage_pools=None):
         '''
         error : Error
-        storagepools : typing.Sequence[~StoragePool]
+        storage_pools : typing.Sequence<+T_co>[~StoragePool]<~StoragePool>
         '''
         self.error = Error.from_json(error) if error else None
-        self.storagepools = [StoragePool.from_json(o) for o in storagepools or []]
+        self.storage_pools = [StoragePool.from_json(o) for o in storage_pools or []]
 
 
 class StoragePoolsResults(Type):
@@ -4281,7 +5193,7 @@ class StoragePoolsResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~StoragePoolsResult]
+        results : typing.Sequence<+T_co>[~StoragePoolsResult]<~StoragePoolsResult>
         '''
         self.results = [StoragePoolsResult.from_json(o) for o in results or []]
 
@@ -4291,36 +5203,36 @@ class StoragesAddParams(Type):
     _toPy = {'storages': 'storages'}
     def __init__(self, storages=None):
         '''
-        storages : typing.Sequence[~StorageAddParams]
+        storages : typing.Sequence<+T_co>[~StorageAddParams]<~StorageAddParams>
         '''
         self.storages = [StorageAddParams.from_json(o) for o in storages or []]
 
 
 class VolumeDetails(Type):
-    _toSchema = {'machineattachments': 'machineattachments', 'volumetag': 'volumetag', 'info': 'info', 'storage': 'storage', 'status': 'status'}
-    _toPy = {'machineattachments': 'machineattachments', 'volumetag': 'volumetag', 'info': 'info', 'storage': 'storage', 'status': 'status'}
-    def __init__(self, info=None, machineattachments=None, status=None, storage=None, volumetag=None):
+    _toSchema = {'info': 'info', 'machine_attachments': 'machine-attachments', 'status': 'status', 'storage': 'storage', 'volume_tag': 'volume-tag'}
+    _toPy = {'info': 'info', 'machine-attachments': 'machine_attachments', 'status': 'status', 'storage': 'storage', 'volume-tag': 'volume_tag'}
+    def __init__(self, info=None, machine_attachments=None, status=None, storage=None, volume_tag=None):
         '''
         info : VolumeInfo
-        machineattachments : typing.Mapping[str, ~VolumeAttachmentInfo]
+        machine_attachments : typing.Mapping<~KT, +VT_co>[str, ~VolumeAttachmentInfo]<~VolumeAttachmentInfo>
         status : EntityStatus
         storage : StorageDetails
-        volumetag : str
+        volume_tag : str
         '''
         self.info = VolumeInfo.from_json(info) if info else None
-        self.machineattachments = {k: VolumeAttachmentInfo.from_json(v) for k, v in (machineattachments or dict()).items()}
+        self.machine_attachments = machine_attachments
         self.status = EntityStatus.from_json(status) if status else None
         self.storage = StorageDetails.from_json(storage) if storage else None
-        self.volumetag = volumetag
+        self.volume_tag = volume_tag
 
 
 class VolumeDetailsListResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
-        result : typing.Sequence[~VolumeDetails]
+        result : typing.Sequence<+T_co>[~VolumeDetails]<~VolumeDetails>
         '''
         self.error = Error.from_json(error) if error else None
         self.result = [VolumeDetails.from_json(o) for o in result or []]
@@ -4331,7 +5243,7 @@ class VolumeDetailsListResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~VolumeDetailsListResult]
+        results : typing.Sequence<+T_co>[~VolumeDetailsListResult]<~VolumeDetailsListResult>
         '''
         self.results = [VolumeDetailsListResult.from_json(o) for o in results or []]
 
@@ -4341,7 +5253,7 @@ class VolumeFilter(Type):
     _toPy = {'machines': 'machines'}
     def __init__(self, machines=None):
         '''
-        machines : typing.Sequence[str]
+        machines : typing.Sequence<+T_co>[str]
         '''
         self.machines = machines
 
@@ -4351,14 +5263,14 @@ class VolumeFilters(Type):
     _toPy = {'filters': 'filters'}
     def __init__(self, filters=None):
         '''
-        filters : typing.Sequence[~VolumeFilter]
+        filters : typing.Sequence<+T_co>[~VolumeFilter]<~VolumeFilter>
         '''
         self.filters = [VolumeFilter.from_json(o) for o in filters or []]
 
 
 class BlockDeviceResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -4373,64 +5285,64 @@ class BlockDeviceResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~BlockDeviceResult]
+        results : typing.Sequence<+T_co>[~BlockDeviceResult]<~BlockDeviceResult>
         '''
         self.results = [BlockDeviceResult.from_json(o) for o in results or []]
 
 
 class Filesystem(Type):
-    _toSchema = {'filesystemtag': 'filesystemtag', 'volumetag': 'volumetag', 'info': 'info'}
-    _toPy = {'filesystemtag': 'filesystemtag', 'volumetag': 'volumetag', 'info': 'info'}
-    def __init__(self, filesystemtag=None, info=None, volumetag=None):
+    _toSchema = {'filesystem_tag': 'filesystem-tag', 'info': 'info', 'volume_tag': 'volume-tag'}
+    _toPy = {'filesystem-tag': 'filesystem_tag', 'info': 'info', 'volume-tag': 'volume_tag'}
+    def __init__(self, filesystem_tag=None, info=None, volume_tag=None):
         '''
-        filesystemtag : str
+        filesystem_tag : str
         info : FilesystemInfo
-        volumetag : str
+        volume_tag : str
         '''
-        self.filesystemtag = filesystemtag
+        self.filesystem_tag = filesystem_tag
         self.info = FilesystemInfo.from_json(info) if info else None
-        self.volumetag = volumetag
+        self.volume_tag = volume_tag
 
 
 class FilesystemAttachment(Type):
-    _toSchema = {'filesystemtag': 'filesystemtag', 'info': 'info', 'machinetag': 'machinetag'}
-    _toPy = {'filesystemtag': 'filesystemtag', 'info': 'info', 'machinetag': 'machinetag'}
-    def __init__(self, filesystemtag=None, info=None, machinetag=None):
+    _toSchema = {'filesystem_tag': 'filesystem-tag', 'info': 'info', 'machine_tag': 'machine-tag'}
+    _toPy = {'filesystem-tag': 'filesystem_tag', 'info': 'info', 'machine-tag': 'machine_tag'}
+    def __init__(self, filesystem_tag=None, info=None, machine_tag=None):
         '''
-        filesystemtag : str
+        filesystem_tag : str
         info : FilesystemAttachmentInfo
-        machinetag : str
+        machine_tag : str
         '''
-        self.filesystemtag = filesystemtag
+        self.filesystem_tag = filesystem_tag
         self.info = FilesystemAttachmentInfo.from_json(info) if info else None
-        self.machinetag = machinetag
+        self.machine_tag = machine_tag
 
 
 class FilesystemAttachmentParams(Type):
-    _toSchema = {'filesystemtag': 'filesystemtag', 'mountpoint': 'mountpoint', 'read_only': 'read-only', 'provider': 'provider', 'filesystemid': 'filesystemid', 'instanceid': 'instanceid', 'machinetag': 'machinetag'}
-    _toPy = {'filesystemtag': 'filesystemtag', 'mountpoint': 'mountpoint', 'provider': 'provider', 'read-only': 'read_only', 'filesystemid': 'filesystemid', 'instanceid': 'instanceid', 'machinetag': 'machinetag'}
-    def __init__(self, filesystemid=None, filesystemtag=None, instanceid=None, machinetag=None, mountpoint=None, provider=None, read_only=None):
-        '''
-        filesystemid : str
-        filesystemtag : str
-        instanceid : str
-        machinetag : str
-        mountpoint : str
+    _toSchema = {'filesystem_id': 'filesystem-id', 'filesystem_tag': 'filesystem-tag', 'instance_id': 'instance-id', 'machine_tag': 'machine-tag', 'mount_point': 'mount-point', 'provider': 'provider', 'read_only': 'read-only'}
+    _toPy = {'filesystem-id': 'filesystem_id', 'filesystem-tag': 'filesystem_tag', 'instance-id': 'instance_id', 'machine-tag': 'machine_tag', 'mount-point': 'mount_point', 'provider': 'provider', 'read-only': 'read_only'}
+    def __init__(self, filesystem_id=None, filesystem_tag=None, instance_id=None, machine_tag=None, mount_point=None, provider=None, read_only=None):
+        '''
+        filesystem_id : str
+        filesystem_tag : str
+        instance_id : str
+        machine_tag : str
+        mount_point : str
         provider : str
         read_only : bool
         '''
-        self.filesystemid = filesystemid
-        self.filesystemtag = filesystemtag
-        self.instanceid = instanceid
-        self.machinetag = machinetag
-        self.mountpoint = mountpoint
+        self.filesystem_id = filesystem_id
+        self.filesystem_tag = filesystem_tag
+        self.instance_id = instance_id
+        self.machine_tag = machine_tag
+        self.mount_point = mount_point
         self.provider = provider
         self.read_only = read_only
 
 
 class FilesystemAttachmentParamsResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -4445,14 +5357,14 @@ class FilesystemAttachmentParamsResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~FilesystemAttachmentParamsResult]
+        results : typing.Sequence<+T_co>[~FilesystemAttachmentParamsResult]<~FilesystemAttachmentParamsResult>
         '''
         self.results = [FilesystemAttachmentParamsResult.from_json(o) for o in results or []]
 
 
 class FilesystemAttachmentResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -4467,46 +5379,46 @@ class FilesystemAttachmentResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~FilesystemAttachmentResult]
+        results : typing.Sequence<+T_co>[~FilesystemAttachmentResult]<~FilesystemAttachmentResult>
         '''
         self.results = [FilesystemAttachmentResult.from_json(o) for o in results or []]
 
 
 class FilesystemAttachments(Type):
-    _toSchema = {'filesystemattachments': 'filesystemattachments'}
-    _toPy = {'filesystemattachments': 'filesystemattachments'}
-    def __init__(self, filesystemattachments=None):
+    _toSchema = {'filesystem_attachments': 'filesystem-attachments'}
+    _toPy = {'filesystem-attachments': 'filesystem_attachments'}
+    def __init__(self, filesystem_attachments=None):
         '''
-        filesystemattachments : typing.Sequence[~FilesystemAttachment]
+        filesystem_attachments : typing.Sequence<+T_co>[~FilesystemAttachment]<~FilesystemAttachment>
         '''
-        self.filesystemattachments = [FilesystemAttachment.from_json(o) for o in filesystemattachments or []]
+        self.filesystem_attachments = [FilesystemAttachment.from_json(o) for o in filesystem_attachments or []]
 
 
 class FilesystemParams(Type):
-    _toSchema = {'attachment': 'attachment', 'attributes': 'attributes', 'size': 'size', 'volumetag': 'volumetag', 'filesystemtag': 'filesystemtag', 'tags': 'tags', 'provider': 'provider'}
-    _toPy = {'attachment': 'attachment', 'attributes': 'attributes', 'size': 'size', 'volumetag': 'volumetag', 'filesystemtag': 'filesystemtag', 'tags': 'tags', 'provider': 'provider'}
-    def __init__(self, attachment=None, attributes=None, filesystemtag=None, provider=None, size=None, tags=None, volumetag=None):
+    _toSchema = {'attachment': 'attachment', 'attributes': 'attributes', 'filesystem_tag': 'filesystem-tag', 'provider': 'provider', 'size': 'size', 'tags': 'tags', 'volume_tag': 'volume-tag'}
+    _toPy = {'attachment': 'attachment', 'attributes': 'attributes', 'filesystem-tag': 'filesystem_tag', 'provider': 'provider', 'size': 'size', 'tags': 'tags', 'volume-tag': 'volume_tag'}
+    def __init__(self, attachment=None, attributes=None, filesystem_tag=None, provider=None, size=None, tags=None, volume_tag=None):
         '''
         attachment : FilesystemAttachmentParams
-        attributes : typing.Mapping[str, typing.Any]
-        filesystemtag : str
+        attributes : typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        filesystem_tag : str
         provider : str
         size : int
-        tags : typing.Mapping[str, str]
-        volumetag : str
+        tags : typing.Mapping<~KT, +VT_co>[str, str]
+        volume_tag : str
         '''
         self.attachment = FilesystemAttachmentParams.from_json(attachment) if attachment else None
         self.attributes = attributes
-        self.filesystemtag = filesystemtag
+        self.filesystem_tag = filesystem_tag
         self.provider = provider
         self.size = size
         self.tags = tags
-        self.volumetag = volumetag
+        self.volume_tag = volume_tag
 
 
 class FilesystemParamsResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -4521,14 +5433,14 @@ class FilesystemParamsResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~FilesystemParamsResult]
+        results : typing.Sequence<+T_co>[~FilesystemParamsResult]<~FilesystemParamsResult>
         '''
         self.results = [FilesystemParamsResult.from_json(o) for o in results or []]
 
 
 class FilesystemResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -4543,7 +5455,7 @@ class FilesystemResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~FilesystemResult]
+        results : typing.Sequence<+T_co>[~FilesystemResult]<~FilesystemResult>
         '''
         self.results = [FilesystemResult.from_json(o) for o in results or []]
 
@@ -4553,7 +5465,7 @@ class Filesystems(Type):
     _toPy = {'filesystems': 'filesystems'}
     def __init__(self, filesystems=None):
         '''
-        filesystems : typing.Sequence[~Filesystem]
+        filesystems : typing.Sequence<+T_co>[~Filesystem]<~Filesystem>
         '''
         self.filesystems = [Filesystem.from_json(o) for o in filesystems or []]
 
@@ -4563,38 +5475,38 @@ class MachineStorageIds(Type):
     _toPy = {'ids': 'ids'}
     def __init__(self, ids=None):
         '''
-        ids : typing.Sequence[~MachineStorageId]
+        ids : typing.Sequence<+T_co>[~MachineStorageId]<~MachineStorageId>
         '''
         self.ids = [MachineStorageId.from_json(o) for o in ids or []]
 
 
 class MachineStorageIdsWatchResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~MachineStorageIdsWatchResult]
+        results : typing.Sequence<+T_co>[~MachineStorageIdsWatchResult]<~MachineStorageIdsWatchResult>
         '''
         self.results = [MachineStorageIdsWatchResult.from_json(o) for o in results or []]
 
 
 class VolumeAttachment(Type):
-    _toSchema = {'volumetag': 'volumetag', 'info': 'info', 'machinetag': 'machinetag'}
-    _toPy = {'volumetag': 'volumetag', 'info': 'info', 'machinetag': 'machinetag'}
-    def __init__(self, info=None, machinetag=None, volumetag=None):
+    _toSchema = {'info': 'info', 'machine_tag': 'machine-tag', 'volume_tag': 'volume-tag'}
+    _toPy = {'info': 'info', 'machine-tag': 'machine_tag', 'volume-tag': 'volume_tag'}
+    def __init__(self, info=None, machine_tag=None, volume_tag=None):
         '''
         info : VolumeAttachmentInfo
-        machinetag : str
-        volumetag : str
+        machine_tag : str
+        volume_tag : str
         '''
         self.info = VolumeAttachmentInfo.from_json(info) if info else None
-        self.machinetag = machinetag
-        self.volumetag = volumetag
+        self.machine_tag = machine_tag
+        self.volume_tag = volume_tag
 
 
 class VolumeAttachmentParamsResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -4609,14 +5521,14 @@ class VolumeAttachmentParamsResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~VolumeAttachmentParamsResult]
+        results : typing.Sequence<+T_co>[~VolumeAttachmentParamsResult]<~VolumeAttachmentParamsResult>
         '''
         self.results = [VolumeAttachmentParamsResult.from_json(o) for o in results or []]
 
 
 class VolumeAttachmentResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -4631,24 +5543,24 @@ class VolumeAttachmentResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~VolumeAttachmentResult]
+        results : typing.Sequence<+T_co>[~VolumeAttachmentResult]<~VolumeAttachmentResult>
         '''
         self.results = [VolumeAttachmentResult.from_json(o) for o in results or []]
 
 
 class VolumeAttachments(Type):
-    _toSchema = {'volumeattachments': 'volumeattachments'}
-    _toPy = {'volumeattachments': 'volumeattachments'}
-    def __init__(self, volumeattachments=None):
+    _toSchema = {'volume_attachments': 'volume-attachments'}
+    _toPy = {'volume-attachments': 'volume_attachments'}
+    def __init__(self, volume_attachments=None):
         '''
-        volumeattachments : typing.Sequence[~VolumeAttachment]
+        volume_attachments : typing.Sequence<+T_co>[~VolumeAttachment]<~VolumeAttachment>
         '''
-        self.volumeattachments = [VolumeAttachment.from_json(o) for o in volumeattachments or []]
+        self.volume_attachments = [VolumeAttachment.from_json(o) for o in volume_attachments or []]
 
 
 class VolumeParamsResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -4663,14 +5575,14 @@ class VolumeParamsResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~VolumeParamsResult]
+        results : typing.Sequence<+T_co>[~VolumeParamsResult]<~VolumeParamsResult>
         '''
         self.results = [VolumeParamsResult.from_json(o) for o in results or []]
 
 
 class VolumeResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -4685,7 +5597,7 @@ class VolumeResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~VolumeResult]
+        results : typing.Sequence<+T_co>[~VolumeResult]<~VolumeResult>
         '''
         self.results = [VolumeResult.from_json(o) for o in results or []]
 
@@ -4695,14 +5607,14 @@ class Volumes(Type):
     _toPy = {'volumes': 'volumes'}
     def __init__(self, volumes=None):
         '''
-        volumes : typing.Sequence[~Volume]
+        volumes : typing.Sequence<+T_co>[~Volume]<~Volume>
         '''
         self.volumes = [Volume.from_json(o) for o in volumes or []]
 
 
 class SpaceResult(Type):
-    _toSchema = {'error': 'Error', 'tag': 'Tag'}
-    _toPy = {'Tag': 'tag', 'Error': 'error'}
+    _toSchema = {'error': 'error', 'tag': 'tag'}
+    _toPy = {'error': 'error', 'tag': 'tag'}
     def __init__(self, error=None, tag=None):
         '''
         error : Error
@@ -4713,18 +5625,18 @@ class SpaceResult(Type):
 
 
 class SpaceResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~SpaceResult]
+        results : typing.Sequence<+T_co>[~SpaceResult]<~SpaceResult>
         '''
         self.results = [SpaceResult.from_json(o) for o in results or []]
 
 
 class ZoneResult(Type):
-    _toSchema = {'error': 'Error', 'available': 'Available', 'name': 'Name'}
-    _toPy = {'Error': 'error', 'Available': 'available', 'Name': 'name'}
+    _toSchema = {'available': 'available', 'error': 'error', 'name': 'name'}
+    _toPy = {'available': 'available', 'error': 'error', 'name': 'name'}
     def __init__(self, available=None, error=None, name=None):
         '''
         available : bool
@@ -4737,36 +5649,36 @@ class ZoneResult(Type):
 
 
 class ZoneResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ZoneResult]
+        results : typing.Sequence<+T_co>[~ZoneResult]<~ZoneResult>
         '''
         self.results = [ZoneResult.from_json(o) for o in results or []]
 
 
 class UndertakerModelInfo(Type):
-    _toSchema = {'globalname': 'GlobalName', 'uuid': 'UUID', 'life': 'Life', 'issystem': 'IsSystem', 'name': 'Name'}
-    _toPy = {'GlobalName': 'globalname', 'IsSystem': 'issystem', 'Life': 'life', 'Name': 'name', 'UUID': 'uuid'}
-    def __init__(self, globalname=None, issystem=None, life=None, name=None, uuid=None):
+    _toSchema = {'global_name': 'global-name', 'is_system': 'is-system', 'life': 'life', 'name': 'name', 'uuid': 'uuid'}
+    _toPy = {'global-name': 'global_name', 'is-system': 'is_system', 'life': 'life', 'name': 'name', 'uuid': 'uuid'}
+    def __init__(self, global_name=None, is_system=None, life=None, name=None, uuid=None):
         '''
-        globalname : str
-        issystem : bool
+        global_name : str
+        is_system : bool
         life : str
         name : str
         uuid : str
         '''
-        self.globalname = globalname
-        self.issystem = issystem
+        self.global_name = global_name
+        self.is_system = is_system
         self.life = life
         self.name = name
         self.uuid = uuid
 
 
 class UndertakerModelInfoResult(Type):
-    _toSchema = {'result': 'Result', 'error': 'Error'}
-    _toPy = {'Result': 'result', 'Error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -4777,156 +5689,168 @@ class UndertakerModelInfoResult(Type):
 
 
 class ApplicationStatusResult(Type):
-    _toSchema = {'units': 'Units', 'application': 'Application', 'error': 'Error'}
-    _toPy = {'Error': 'error', 'Application': 'application', 'Units': 'units'}
+    _toSchema = {'application': 'application', 'error': 'error', 'units': 'units'}
+    _toPy = {'application': 'application', 'error': 'error', 'units': 'units'}
     def __init__(self, application=None, error=None, units=None):
         '''
         application : StatusResult
         error : Error
-        units : typing.Mapping[str, ~StatusResult]
+        units : typing.Mapping<~KT, +VT_co>[str, ~StatusResult]<~StatusResult>
         '''
         self.application = StatusResult.from_json(application) if application else None
         self.error = Error.from_json(error) if error else None
-        self.units = {k: StatusResult.from_json(v) for k, v in (units or dict()).items()}
+        self.units = units
 
 
 class ApplicationStatusResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ApplicationStatusResult]
+        results : typing.Sequence<+T_co>[~ApplicationStatusResult]<~ApplicationStatusResult>
         '''
         self.results = [ApplicationStatusResult.from_json(o) for o in results or []]
 
 
-class CharmURL(Type):
-    _toSchema = {'url': 'URL'}
-    _toPy = {'URL': 'url'}
-    def __init__(self, url=None):
-        '''
-        url : str
-        '''
-        self.url = url
-
-
 class CharmURLs(Type):
-    _toSchema = {'urls': 'URLs'}
-    _toPy = {'URLs': 'urls'}
+    _toSchema = {'urls': 'urls'}
+    _toPy = {'urls': 'urls'}
     def __init__(self, urls=None):
         '''
-        urls : typing.Sequence[~CharmURL]
+        urls : typing.Sequence<+T_co>[~CharmURL]<~CharmURL>
         '''
         self.urls = [CharmURL.from_json(o) for o in urls or []]
 
 
 class ConfigSettingsResult(Type):
-    _toSchema = {'settings': 'Settings', 'error': 'Error'}
-    _toPy = {'Settings': 'settings', 'Error': 'error'}
+    _toSchema = {'error': 'error', 'settings': 'settings'}
+    _toPy = {'error': 'error', 'settings': 'settings'}
     def __init__(self, error=None, settings=None):
         '''
         error : Error
-        settings : typing.Mapping[str, typing.Any]
+        settings : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         '''
         self.error = Error.from_json(error) if error else None
         self.settings = settings
 
 
 class ConfigSettingsResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ConfigSettingsResult]
+        results : typing.Sequence<+T_co>[~ConfigSettingsResult]<~ConfigSettingsResult>
         '''
         self.results = [ConfigSettingsResult.from_json(o) for o in results or []]
 
 
 class Endpoint(Type):
-    _toSchema = {'relation': 'Relation', 'applicationname': 'ApplicationName'}
-    _toPy = {'Relation': 'relation', 'ApplicationName': 'applicationname'}
-    def __init__(self, applicationname=None, relation=None):
+    _toSchema = {'application_name': 'application-name', 'relation': 'relation'}
+    _toPy = {'application-name': 'application_name', 'relation': 'relation'}
+    def __init__(self, application_name=None, relation=None):
         '''
-        applicationname : str
-        relation : Relation
+        application_name : str
+        relation : CharmRelation
         '''
-        self.applicationname = applicationname
-        self.relation = Relation.from_json(relation) if relation else None
+        self.application_name = application_name
+        self.relation = CharmRelation.from_json(relation) if relation else None
 
 
 class EntitiesCharmURL(Type):
-    _toSchema = {'entities': 'Entities'}
-    _toPy = {'Entities': 'entities'}
+    _toSchema = {'entities': 'entities'}
+    _toPy = {'entities': 'entities'}
     def __init__(self, entities=None):
         '''
-        entities : typing.Sequence[~EntityCharmURL]
+        entities : typing.Sequence<+T_co>[~EntityCharmURL]<~EntityCharmURL>
         '''
         self.entities = [EntityCharmURL.from_json(o) for o in entities or []]
 
 
 class EntitiesPortRanges(Type):
-    _toSchema = {'entities': 'Entities'}
-    _toPy = {'Entities': 'entities'}
+    _toSchema = {'entities': 'entities'}
+    _toPy = {'entities': 'entities'}
     def __init__(self, entities=None):
         '''
-        entities : typing.Sequence[~EntityPortRange]
+        entities : typing.Sequence<+T_co>[~EntityPortRange]<~EntityPortRange>
         '''
         self.entities = [EntityPortRange.from_json(o) for o in entities or []]
 
 
 class EntityCharmURL(Type):
-    _toSchema = {'charmurl': 'CharmURL', 'tag': 'Tag'}
-    _toPy = {'CharmURL': 'charmurl', 'Tag': 'tag'}
-    def __init__(self, charmurl=None, tag=None):
+    _toSchema = {'charm_url': 'charm-url', 'tag': 'tag'}
+    _toPy = {'charm-url': 'charm_url', 'tag': 'tag'}
+    def __init__(self, charm_url=None, tag=None):
         '''
-        charmurl : str
+        charm_url : str
         tag : str
         '''
-        self.charmurl = charmurl
+        self.charm_url = charm_url
         self.tag = tag
 
 
 class EntityPortRange(Type):
-    _toSchema = {'toport': 'ToPort', 'fromport': 'FromPort', 'protocol': 'Protocol', 'tag': 'Tag'}
-    _toPy = {'FromPort': 'fromport', 'Tag': 'tag', 'Protocol': 'protocol', 'ToPort': 'toport'}
-    def __init__(self, fromport=None, protocol=None, tag=None, toport=None):
+    _toSchema = {'from_port': 'from-port', 'protocol': 'protocol', 'tag': 'tag', 'to_port': 'to-port'}
+    _toPy = {'from-port': 'from_port', 'protocol': 'protocol', 'tag': 'tag', 'to-port': 'to_port'}
+    def __init__(self, from_port=None, protocol=None, tag=None, to_port=None):
         '''
-        fromport : int
+        from_port : int
         protocol : str
         tag : str
-        toport : int
+        to_port : int
         '''
-        self.fromport = fromport
+        self.from_port = from_port
         self.protocol = protocol
         self.tag = tag
-        self.toport = toport
+        self.to_port = to_port
+
+
+class EntityWorkloadVersion(Type):
+    _toSchema = {'tag': 'tag', 'workload_version': 'workload-version'}
+    _toPy = {'tag': 'tag', 'workload-version': 'workload_version'}
+    def __init__(self, tag=None, workload_version=None):
+        '''
+        tag : str
+        workload_version : str
+        '''
+        self.tag = tag
+        self.workload_version = workload_version
+
+
+class EntityWorkloadVersions(Type):
+    _toSchema = {'entities': 'entities'}
+    _toPy = {'entities': 'entities'}
+    def __init__(self, entities=None):
+        '''
+        entities : typing.Sequence<+T_co>[~EntityWorkloadVersion]<~EntityWorkloadVersion>
+        '''
+        self.entities = [EntityWorkloadVersion.from_json(o) for o in entities or []]
 
 
 class GetLeadershipSettingsBulkResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~GetLeadershipSettingsResult]
+        results : typing.Sequence<+T_co>[~GetLeadershipSettingsResult]<~GetLeadershipSettingsResult>
         '''
         self.results = [GetLeadershipSettingsResult.from_json(o) for o in results or []]
 
 
 class GetLeadershipSettingsResult(Type):
-    _toSchema = {'settings': 'Settings', 'error': 'Error'}
-    _toPy = {'Settings': 'settings', 'Error': 'error'}
+    _toSchema = {'error': 'error', 'settings': 'settings'}
+    _toPy = {'error': 'error', 'settings': 'settings'}
     def __init__(self, error=None, settings=None):
         '''
         error : Error
-        settings : typing.Mapping[str, str]
+        settings : typing.Mapping<~KT, +VT_co>[str, str]
         '''
         self.error = Error.from_json(error) if error else None
         self.settings = settings
 
 
 class IntResult(Type):
-    _toSchema = {'result': 'Result', 'error': 'Error'}
-    _toPy = {'Result': 'result', 'Error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -4937,40 +5861,40 @@ class IntResult(Type):
 
 
 class IntResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~IntResult]
+        results : typing.Sequence<+T_co>[~IntResult]<~IntResult>
         '''
         self.results = [IntResult.from_json(o) for o in results or []]
 
 
 class MergeLeadershipSettingsBulkParams(Type):
-    _toSchema = {'params': 'Params'}
-    _toPy = {'Params': 'params'}
+    _toSchema = {'params': 'params'}
+    _toPy = {'params': 'params'}
     def __init__(self, params=None):
         '''
-        params : typing.Sequence[~MergeLeadershipSettingsParam]
+        params : typing.Sequence<+T_co>[~MergeLeadershipSettingsParam]<~MergeLeadershipSettingsParam>
         '''
         self.params = [MergeLeadershipSettingsParam.from_json(o) for o in params or []]
 
 
 class MergeLeadershipSettingsParam(Type):
-    _toSchema = {'applicationtag': 'ApplicationTag', 'settings': 'Settings'}
-    _toPy = {'Settings': 'settings', 'ApplicationTag': 'applicationtag'}
-    def __init__(self, applicationtag=None, settings=None):
+    _toSchema = {'application_tag': 'application-tag', 'settings': 'settings'}
+    _toPy = {'application-tag': 'application_tag', 'settings': 'settings'}
+    def __init__(self, application_tag=None, settings=None):
         '''
-        applicationtag : str
-        settings : typing.Mapping[str, str]
+        application_tag : str
+        settings : typing.Mapping<~KT, +VT_co>[str, str]
         '''
-        self.applicationtag = applicationtag
+        self.application_tag = application_tag
         self.settings = settings
 
 
 class ModelResult(Type):
-    _toSchema = {'uuid': 'UUID', 'error': 'Error', 'name': 'Name'}
-    _toPy = {'Error': 'error', 'Name': 'name', 'UUID': 'uuid'}
+    _toSchema = {'error': 'error', 'name': 'name', 'uuid': 'uuid'}
+    _toPy = {'error': 'error', 'name': 'name', 'uuid': 'uuid'}
     def __init__(self, error=None, name=None, uuid=None):
         '''
         error : Error
@@ -4983,18 +5907,18 @@ class ModelResult(Type):
 
 
 class RelationIds(Type):
-    _toSchema = {'relationids': 'RelationIds'}
-    _toPy = {'RelationIds': 'relationids'}
-    def __init__(self, relationids=None):
+    _toSchema = {'relation_ids': 'relation-ids'}
+    _toPy = {'relation-ids': 'relation_ids'}
+    def __init__(self, relation_ids=None):
         '''
-        relationids : typing.Sequence[int]
+        relation_ids : typing.Sequence<+T_co>[int]
         '''
-        self.relationids = relationids
+        self.relation_ids = relation_ids
 
 
 class RelationResult(Type):
-    _toSchema = {'key': 'Key', 'life': 'Life', 'id_': 'Id', 'endpoint': 'Endpoint', 'error': 'Error'}
-    _toPy = {'Endpoint': 'endpoint', 'Id': 'id_', 'Error': 'error', 'Key': 'key', 'Life': 'life'}
+    _toSchema = {'endpoint': 'endpoint', 'error': 'error', 'id_': 'id', 'key': 'key', 'life': 'life'}
+    _toPy = {'endpoint': 'endpoint', 'error': 'error', 'id': 'id_', 'key': 'key', 'life': 'life'}
     def __init__(self, endpoint=None, error=None, id_=None, key=None, life=None):
         '''
         endpoint : Endpoint
@@ -5011,18 +5935,18 @@ class RelationResult(Type):
 
 
 class RelationResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~RelationResult]
+        results : typing.Sequence<+T_co>[~RelationResult]<~RelationResult>
         '''
         self.results = [RelationResult.from_json(o) for o in results or []]
 
 
 class RelationUnit(Type):
-    _toSchema = {'relation': 'Relation', 'unit': 'Unit'}
-    _toPy = {'Relation': 'relation', 'Unit': 'unit'}
+    _toSchema = {'relation': 'relation', 'unit': 'unit'}
+    _toPy = {'relation': 'relation', 'unit': 'unit'}
     def __init__(self, relation=None, unit=None):
         '''
         relation : str
@@ -5033,36 +5957,36 @@ class RelationUnit(Type):
 
 
 class RelationUnitPair(Type):
-    _toSchema = {'localunit': 'LocalUnit', 'relation': 'Relation', 'remoteunit': 'RemoteUnit'}
-    _toPy = {'RemoteUnit': 'remoteunit', 'Relation': 'relation', 'LocalUnit': 'localunit'}
-    def __init__(self, localunit=None, relation=None, remoteunit=None):
+    _toSchema = {'local_unit': 'local-unit', 'relation': 'relation', 'remote_unit': 'remote-unit'}
+    _toPy = {'local-unit': 'local_unit', 'relation': 'relation', 'remote-unit': 'remote_unit'}
+    def __init__(self, local_unit=None, relation=None, remote_unit=None):
         '''
-        localunit : str
+        local_unit : str
         relation : str
-        remoteunit : str
+        remote_unit : str
         '''
-        self.localunit = localunit
+        self.local_unit = local_unit
         self.relation = relation
-        self.remoteunit = remoteunit
+        self.remote_unit = remote_unit
 
 
 class RelationUnitPairs(Type):
-    _toSchema = {'relationunitpairs': 'RelationUnitPairs'}
-    _toPy = {'RelationUnitPairs': 'relationunitpairs'}
-    def __init__(self, relationunitpairs=None):
+    _toSchema = {'relation_unit_pairs': 'relation-unit-pairs'}
+    _toPy = {'relation-unit-pairs': 'relation_unit_pairs'}
+    def __init__(self, relation_unit_pairs=None):
         '''
-        relationunitpairs : typing.Sequence[~RelationUnitPair]
+        relation_unit_pairs : typing.Sequence<+T_co>[~RelationUnitPair]<~RelationUnitPair>
         '''
-        self.relationunitpairs = [RelationUnitPair.from_json(o) for o in relationunitpairs or []]
+        self.relation_unit_pairs = [RelationUnitPair.from_json(o) for o in relation_unit_pairs or []]
 
 
 class RelationUnitSettings(Type):
-    _toSchema = {'settings': 'Settings', 'relation': 'Relation', 'unit': 'Unit'}
-    _toPy = {'Settings': 'settings', 'Relation': 'relation', 'Unit': 'unit'}
+    _toSchema = {'relation': 'relation', 'settings': 'settings', 'unit': 'unit'}
+    _toPy = {'relation': 'relation', 'settings': 'settings', 'unit': 'unit'}
     def __init__(self, relation=None, settings=None, unit=None):
         '''
         relation : str
-        settings : typing.Mapping[str, str]
+        settings : typing.Mapping<~KT, +VT_co>[str, str]
         unit : str
         '''
         self.relation = relation
@@ -5071,38 +5995,38 @@ class RelationUnitSettings(Type):
 
 
 class RelationUnits(Type):
-    _toSchema = {'relationunits': 'RelationUnits'}
-    _toPy = {'RelationUnits': 'relationunits'}
-    def __init__(self, relationunits=None):
+    _toSchema = {'relation_units': 'relation-units'}
+    _toPy = {'relation-units': 'relation_units'}
+    def __init__(self, relation_units=None):
         '''
-        relationunits : typing.Sequence[~RelationUnit]
+        relation_units : typing.Sequence<+T_co>[~RelationUnit]<~RelationUnit>
         '''
-        self.relationunits = [RelationUnit.from_json(o) for o in relationunits or []]
+        self.relation_units = [RelationUnit.from_json(o) for o in relation_units or []]
 
 
 class RelationUnitsSettings(Type):
-    _toSchema = {'relationunits': 'RelationUnits'}
-    _toPy = {'RelationUnits': 'relationunits'}
-    def __init__(self, relationunits=None):
+    _toSchema = {'relation_units': 'relation-units'}
+    _toPy = {'relation-units': 'relation_units'}
+    def __init__(self, relation_units=None):
         '''
-        relationunits : typing.Sequence[~RelationUnitSettings]
+        relation_units : typing.Sequence<+T_co>[~RelationUnitSettings]<~RelationUnitSettings>
         '''
-        self.relationunits = [RelationUnitSettings.from_json(o) for o in relationunits or []]
+        self.relation_units = [RelationUnitSettings.from_json(o) for o in relation_units or []]
 
 
 class RelationUnitsWatchResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~RelationUnitsWatchResult]
+        results : typing.Sequence<+T_co>[~RelationUnitsWatchResult]<~RelationUnitsWatchResult>
         '''
         self.results = [RelationUnitsWatchResult.from_json(o) for o in results or []]
 
 
 class ResolvedModeResult(Type):
-    _toSchema = {'mode': 'Mode', 'error': 'Error'}
-    _toPy = {'Error': 'error', 'Mode': 'mode'}
+    _toSchema = {'error': 'error', 'mode': 'mode'}
+    _toPy = {'error': 'error', 'mode': 'mode'}
     def __init__(self, error=None, mode=None):
         '''
         error : Error
@@ -5113,67 +6037,67 @@ class ResolvedModeResult(Type):
 
 
 class ResolvedModeResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~ResolvedModeResult]
+        results : typing.Sequence<+T_co>[~ResolvedModeResult]<~ResolvedModeResult>
         '''
         self.results = [ResolvedModeResult.from_json(o) for o in results or []]
 
 
 class SettingsResult(Type):
-    _toSchema = {'settings': 'Settings', 'error': 'Error'}
-    _toPy = {'Settings': 'settings', 'Error': 'error'}
+    _toSchema = {'error': 'error', 'settings': 'settings'}
+    _toPy = {'error': 'error', 'settings': 'settings'}
     def __init__(self, error=None, settings=None):
         '''
         error : Error
-        settings : typing.Mapping[str, str]
+        settings : typing.Mapping<~KT, +VT_co>[str, str]
         '''
         self.error = Error.from_json(error) if error else None
         self.settings = settings
 
 
 class SettingsResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~SettingsResult]
+        results : typing.Sequence<+T_co>[~SettingsResult]<~SettingsResult>
         '''
         self.results = [SettingsResult.from_json(o) for o in results or []]
 
 
 class StorageAttachment(Type):
-    _toSchema = {'storagetag': 'StorageTag', 'location': 'Location', 'life': 'Life', 'unittag': 'UnitTag', 'ownertag': 'OwnerTag', 'kind': 'Kind'}
-    _toPy = {'OwnerTag': 'ownertag', 'StorageTag': 'storagetag', 'UnitTag': 'unittag', 'Life': 'life', 'Location': 'location', 'Kind': 'kind'}
-    def __init__(self, kind=None, life=None, location=None, ownertag=None, storagetag=None, unittag=None):
+    _toSchema = {'kind': 'kind', 'life': 'life', 'location': 'location', 'owner_tag': 'owner-tag', 'storage_tag': 'storage-tag', 'unit_tag': 'unit-tag'}
+    _toPy = {'kind': 'kind', 'life': 'life', 'location': 'location', 'owner-tag': 'owner_tag', 'storage-tag': 'storage_tag', 'unit-tag': 'unit_tag'}
+    def __init__(self, kind=None, life=None, location=None, owner_tag=None, storage_tag=None, unit_tag=None):
         '''
         kind : int
         life : str
         location : str
-        ownertag : str
-        storagetag : str
-        unittag : str
+        owner_tag : str
+        storage_tag : str
+        unit_tag : str
         '''
         self.kind = kind
         self.life = life
         self.location = location
-        self.ownertag = ownertag
-        self.storagetag = storagetag
-        self.unittag = unittag
+        self.owner_tag = owner_tag
+        self.storage_tag = storage_tag
+        self.unit_tag = unit_tag
 
 
 class StorageAttachmentId(Type):
-    _toSchema = {'unittag': 'unittag', 'storagetag': 'storagetag'}
-    _toPy = {'unittag': 'unittag', 'storagetag': 'storagetag'}
-    def __init__(self, storagetag=None, unittag=None):
+    _toSchema = {'storage_tag': 'storage-tag', 'unit_tag': 'unit-tag'}
+    _toPy = {'storage-tag': 'storage_tag', 'unit-tag': 'unit_tag'}
+    def __init__(self, storage_tag=None, unit_tag=None):
         '''
-        storagetag : str
-        unittag : str
+        storage_tag : str
+        unit_tag : str
         '''
-        self.storagetag = storagetag
-        self.unittag = unittag
+        self.storage_tag = storage_tag
+        self.unit_tag = unit_tag
 
 
 class StorageAttachmentIds(Type):
@@ -5181,14 +6105,14 @@ class StorageAttachmentIds(Type):
     _toPy = {'ids': 'ids'}
     def __init__(self, ids=None):
         '''
-        ids : typing.Sequence[~StorageAttachmentId]
+        ids : typing.Sequence<+T_co>[~StorageAttachmentId]<~StorageAttachmentId>
         '''
         self.ids = [StorageAttachmentId.from_json(o) for o in ids or []]
 
 
 class StorageAttachmentIdsResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -5203,14 +6127,14 @@ class StorageAttachmentIdsResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~StorageAttachmentIdsResult]
+        results : typing.Sequence<+T_co>[~StorageAttachmentIdsResult]<~StorageAttachmentIdsResult>
         '''
         self.results = [StorageAttachmentIdsResult.from_json(o) for o in results or []]
 
 
 class StorageAttachmentResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -5225,14 +6149,14 @@ class StorageAttachmentResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~StorageAttachmentResult]
+        results : typing.Sequence<+T_co>[~StorageAttachmentResult]<~StorageAttachmentResult>
         '''
         self.results = [StorageAttachmentResult.from_json(o) for o in results or []]
 
 
 class StringBoolResult(Type):
-    _toSchema = {'result': 'Result', 'ok': 'Ok', 'error': 'Error'}
-    _toPy = {'Result': 'result', 'Error': 'error', 'Ok': 'ok'}
+    _toSchema = {'error': 'error', 'ok': 'ok', 'result': 'result'}
+    _toPy = {'error': 'error', 'ok': 'ok', 'result': 'result'}
     def __init__(self, error=None, ok=None, result=None):
         '''
         error : Error
@@ -5245,72 +6169,72 @@ class StringBoolResult(Type):
 
 
 class StringBoolResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~StringBoolResult]
+        results : typing.Sequence<+T_co>[~StringBoolResult]<~StringBoolResult>
         '''
         self.results = [StringBoolResult.from_json(o) for o in results or []]
 
 
 class UnitNetworkConfig(Type):
-    _toSchema = {'unittag': 'UnitTag', 'bindingname': 'BindingName'}
-    _toPy = {'BindingName': 'bindingname', 'UnitTag': 'unittag'}
-    def __init__(self, bindingname=None, unittag=None):
+    _toSchema = {'binding_name': 'binding-name', 'unit_tag': 'unit-tag'}
+    _toPy = {'binding-name': 'binding_name', 'unit-tag': 'unit_tag'}
+    def __init__(self, binding_name=None, unit_tag=None):
         '''
-        bindingname : str
-        unittag : str
+        binding_name : str
+        unit_tag : str
         '''
-        self.bindingname = bindingname
-        self.unittag = unittag
+        self.binding_name = binding_name
+        self.unit_tag = unit_tag
 
 
 class UnitNetworkConfigResult(Type):
-    _toSchema = {'info': 'Info', 'error': 'Error'}
-    _toPy = {'Error': 'error', 'Info': 'info'}
+    _toSchema = {'error': 'error', 'info': 'info'}
+    _toPy = {'error': 'error', 'info': 'info'}
     def __init__(self, error=None, info=None):
         '''
         error : Error
-        info : typing.Sequence[~NetworkConfig]
+        info : typing.Sequence<+T_co>[~NetworkConfig]<~NetworkConfig>
         '''
         self.error = Error.from_json(error) if error else None
         self.info = [NetworkConfig.from_json(o) for o in info or []]
 
 
 class UnitNetworkConfigResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~UnitNetworkConfigResult]
+        results : typing.Sequence<+T_co>[~UnitNetworkConfigResult]<~UnitNetworkConfigResult>
         '''
         self.results = [UnitNetworkConfigResult.from_json(o) for o in results or []]
 
 
 class UnitsNetworkConfig(Type):
-    _toSchema = {'args': 'Args'}
-    _toPy = {'Args': 'args'}
+    _toSchema = {'args': 'args'}
+    _toPy = {'args': 'args'}
     def __init__(self, args=None):
         '''
-        args : typing.Sequence[~UnitNetworkConfig]
+        args : typing.Sequence<+T_co>[~UnitNetworkConfig]<~UnitNetworkConfig>
         '''
         self.args = [UnitNetworkConfig.from_json(o) for o in args or []]
 
 
 class EntitiesVersion(Type):
-    _toSchema = {'agenttools': 'AgentTools'}
-    _toPy = {'AgentTools': 'agenttools'}
-    def __init__(self, agenttools=None):
+    _toSchema = {'agent_tools': 'agent-tools'}
+    _toPy = {'agent-tools': 'agent_tools'}
+    def __init__(self, agent_tools=None):
         '''
-        agenttools : typing.Sequence[~EntityVersion]
+        agent_tools : typing.Sequence<+T_co>[~EntityVersion]<~EntityVersion>
         '''
-        self.agenttools = [EntityVersion.from_json(o) for o in agenttools or []]
+        self.agent_tools = [EntityVersion.from_json(o) for o in agent_tools or []]
 
 
 class EntityVersion(Type):
-    _toSchema = {'tools': 'Tools', 'tag': 'Tag'}
-    _toPy = {'Tag': 'tag', 'Tools': 'tools'}
+    _toSchema = {'tag': 'tag', 'tools': 'tools'}
+    _toPy = {'tag': 'tag', 'tools': 'tools'}
     def __init__(self, tag=None, tools=None):
         '''
         tag : str
@@ -5320,9 +6244,19 @@ class EntityVersion(Type):
         self.tools = Version.from_json(tools) if tools else None
 
 
+class Version(Type):
+    _toSchema = {'version': 'version'}
+    _toPy = {'version': 'version'}
+    def __init__(self, version=None):
+        '''
+        version : Binary
+        '''
+        self.version = Binary.from_json(version) if version else None
+
+
 class VersionResult(Type):
-    _toSchema = {'error': 'Error', 'version': 'Version'}
-    _toPy = {'Error': 'error', 'Version': 'version'}
+    _toSchema = {'error': 'error', 'version': 'version'}
+    _toPy = {'error': 'error', 'version': 'version'}
     def __init__(self, error=None, version=None):
         '''
         error : Error
@@ -5333,40 +6267,36 @@ class VersionResult(Type):
 
 
 class VersionResults(Type):
-    _toSchema = {'results': 'Results'}
-    _toPy = {'Results': 'results'}
+    _toSchema = {'results': 'results'}
+    _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~VersionResult]
+        results : typing.Sequence<+T_co>[~VersionResult]<~VersionResult>
         '''
         self.results = [VersionResult.from_json(o) for o in results or []]
 
 
 class AddUser(Type):
-    _toSchema = {'model_access_permission': 'model-access-permission', 'shared_model_tags': 'shared-model-tags', 'password': 'password', 'username': 'username', 'display_name': 'display-name'}
-    _toPy = {'model-access-permission': 'model_access_permission', 'password': 'password', 'username': 'username', 'shared-model-tags': 'shared_model_tags', 'display-name': 'display_name'}
-    def __init__(self, display_name=None, model_access_permission=None, password=None, shared_model_tags=None, username=None):
+    _toSchema = {'display_name': 'display-name', 'password': 'password', 'username': 'username'}
+    _toPy = {'display-name': 'display_name', 'password': 'password', 'username': 'username'}
+    def __init__(self, display_name=None, password=None, username=None):
         '''
         display_name : str
-        model_access_permission : str
         password : str
-        shared_model_tags : typing.Sequence[str]
         username : str
         '''
         self.display_name = display_name
-        self.model_access_permission = model_access_permission
         self.password = password
-        self.shared_model_tags = shared_model_tags
         self.username = username
 
 
 class AddUserResult(Type):
-    _toSchema = {'tag': 'tag', 'error': 'error', 'secret_key': 'secret-key'}
-    _toPy = {'error': 'error', 'tag': 'tag', 'secret-key': 'secret_key'}
+    _toSchema = {'error': 'error', 'secret_key': 'secret-key', 'tag': 'tag'}
+    _toPy = {'error': 'error', 'secret-key': 'secret_key', 'tag': 'tag'}
     def __init__(self, error=None, secret_key=None, tag=None):
         '''
         error : Error
-        secret_key : typing.Sequence[int]
+        secret_key : typing.Sequence<+T_co>[int]
         tag : str
         '''
         self.error = Error.from_json(error) if error else None
@@ -5379,7 +6309,7 @@ class AddUserResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~AddUserResult]
+        results : typing.Sequence<+T_co>[~AddUserResult]<~AddUserResult>
         '''
         self.results = [AddUserResult.from_json(o) for o in results or []]
 
@@ -5389,38 +6319,17 @@ class AddUsers(Type):
     _toPy = {'users': 'users'}
     def __init__(self, users=None):
         '''
-        users : typing.Sequence[~AddUser]
+        users : typing.Sequence<+T_co>[~AddUser]<~AddUser>
         '''
         self.users = [AddUser.from_json(o) for o in users or []]
 
 
-class MacaroonResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
-    def __init__(self, error=None, result=None):
-        '''
-        error : Error
-        result : Macaroon
-        '''
-        self.error = Error.from_json(error) if error else None
-        self.result = Macaroon.from_json(result) if result else None
-
-
-class MacaroonResults(Type):
-    _toSchema = {'results': 'results'}
-    _toPy = {'results': 'results'}
-    def __init__(self, results=None):
-        '''
-        results : typing.Sequence[~MacaroonResult]
-        '''
-        self.results = [MacaroonResult.from_json(o) for o in results or []]
-
-
 class UserInfo(Type):
-    _toSchema = {'date_created': 'date-created', 'last_connection': 'last-connection', 'disabled': 'disabled', 'display_name': 'display-name', 'created_by': 'created-by', 'username': 'username'}
-    _toPy = {'last-connection': 'last_connection', 'date-created': 'date_created', 'disabled': 'disabled', 'created-by': 'created_by', 'username': 'username', 'display-name': 'display_name'}
-    def __init__(self, created_by=None, date_created=None, disabled=None, display_name=None, last_connection=None, username=None):
+    _toSchema = {'access': 'access', 'created_by': 'created-by', 'date_created': 'date-created', 'disabled': 'disabled', 'display_name': 'display-name', 'last_connection': 'last-connection', 'username': 'username'}
+    _toPy = {'access': 'access', 'created-by': 'created_by', 'date-created': 'date_created', 'disabled': 'disabled', 'display-name': 'display_name', 'last-connection': 'last_connection', 'username': 'username'}
+    def __init__(self, access=None, created_by=None, date_created=None, disabled=None, display_name=None, last_connection=None, username=None):
         '''
+        access : str
         created_by : str
         date_created : str
         disabled : bool
@@ -5428,6 +6337,7 @@ class UserInfo(Type):
         last_connection : str
         username : str
         '''
+        self.access = access
         self.created_by = created_by
         self.date_created = date_created
         self.disabled = disabled
@@ -5437,11 +6347,11 @@ class UserInfo(Type):
 
 
 class UserInfoRequest(Type):
-    _toSchema = {'include_disabled': 'include-disabled', 'entities': 'entities'}
-    _toPy = {'include-disabled': 'include_disabled', 'entities': 'entities'}
+    _toSchema = {'entities': 'entities', 'include_disabled': 'include-disabled'}
+    _toPy = {'entities': 'entities', 'include-disabled': 'include_disabled'}
     def __init__(self, entities=None, include_disabled=None):
         '''
-        entities : typing.Sequence[~Entity]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
         include_disabled : bool
         '''
         self.entities = [Entity.from_json(o) for o in entities or []]
@@ -5449,8 +6359,8 @@ class UserInfoRequest(Type):
 
 
 class UserInfoResult(Type):
-    _toSchema = {'result': 'result', 'error': 'error'}
-    _toPy = {'result': 'result', 'error': 'error'}
+    _toSchema = {'error': 'error', 'result': 'result'}
+    _toPy = {'error': 'error', 'result': 'result'}
     def __init__(self, error=None, result=None):
         '''
         error : Error
@@ -5465,7 +6375,7 @@ class UserInfoResults(Type):
     _toPy = {'results': 'results'}
     def __init__(self, results=None):
         '''
-        results : typing.Sequence[~UserInfoResult]
+        results : typing.Sequence<+T_co>[~UserInfoResult]<~UserInfoResult>
         '''
         self.results = [UserInfoResult.from_json(o) for o in results or []]
 
@@ -5502,16 +6412,15 @@ class ActionFacade(Type):
                                                                   'type': 'array'}},
                                        'type': 'object'},
                      'ActionSpec': {'additionalProperties': False,
-                                    'properties': {'Description': {'type': 'string'},
-                                                   'Params': {'patternProperties': {'.*': {'additionalProperties': True,
+                                    'properties': {'description': {'type': 'string'},
+                                                   'params': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                            'type': 'object'}},
                                                               'type': 'object'}},
-                                    'required': ['Description', 'Params'],
+                                    'required': ['description', 'params'],
                                     'type': 'object'},
                      'Actions': {'additionalProperties': False,
-                                 'properties': {'ActionSpecs': {'patternProperties': {'.*': {'$ref': '#/definitions/ActionSpec'}},
-                                                                'type': 'object'}},
-                                 'required': ['ActionSpecs'],
+                                 'properties': {'actions': {'items': {'$ref': '#/definitions/Action'},
+                                                            'type': 'array'}},
                                  'type': 'object'},
                      'ActionsByName': {'additionalProperties': False,
                                        'properties': {'actions': {'items': {'$ref': '#/definitions/ActionResult'},
@@ -5534,8 +6443,9 @@ class ActionFacade(Type):
                                                                        'type': 'array'}},
                                             'type': 'object'},
                      'ApplicationCharmActionsResult': {'additionalProperties': False,
-                                                       'properties': {'ApplicationTag': {'type': 'string'},
-                                                                      'actions': {'$ref': '#/definitions/Actions'},
+                                                       'properties': {'actions': {'patternProperties': {'.*': {'$ref': '#/definitions/ActionSpec'}},
+                                                                                  'type': 'object'},
+                                                                      'application-tag': {'type': 'string'},
                                                                       'error': {'$ref': '#/definitions/Error'}},
                                                        'type': 'object'},
                      'ApplicationsCharmActionsResults': {'additionalProperties': False,
@@ -5543,23 +6453,23 @@ class ActionFacade(Type):
                                                                                     'type': 'array'}},
                                                          'type': 'object'},
                      'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'FindActionsByNames': {'additionalProperties': False,
                                             'properties': {'names': {'items': {'type': 'string'},
@@ -5576,50 +6486,18 @@ class ActionFacade(Type):
                                                                     'type': 'object'}},
                                          'required': ['matches'],
                                          'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'RunParams': {'additionalProperties': False,
-                                   'properties': {'Applications': {'items': {'type': 'string'},
+                                   'properties': {'applications': {'items': {'type': 'string'},
                                                                    'type': 'array'},
-                                                  'Commands': {'type': 'string'},
-                                                  'Machines': {'items': {'type': 'string'},
+                                                  'commands': {'type': 'string'},
+                                                  'machines': {'items': {'type': 'string'},
                                                                'type': 'array'},
-                                                  'Timeout': {'type': 'integer'},
-                                                  'Units': {'items': {'type': 'string'},
+                                                  'timeout': {'type': 'integer'},
+                                                  'units': {'items': {'type': 'string'},
                                                             'type': 'array'}},
-                                   'required': ['Commands',
-                                                'Timeout',
-                                                'Machines',
-                                                'Applications',
-                                                'Units'],
-                                   'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                   'required': ['commands', 'timeout'],
+                                   'type': 'object'}},
      'properties': {'Actions': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                'Result': {'$ref': '#/definitions/ActionResults'}},
                                 'type': 'object'},
@@ -5662,13 +6540,13 @@ class ActionFacade(Type):
     @ReturnMapping(ActionResults)
     async def Actions(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ActionResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ActionResult]<~ActionResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Action', Request='Actions', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Action', request='Actions', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -5677,13 +6555,13 @@ class ActionFacade(Type):
     @ReturnMapping(ApplicationsCharmActionsResults)
     async def ApplicationsCharmsActions(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ApplicationCharmActionsResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ApplicationCharmActionsResult]<~ApplicationCharmActionsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Action', Request='ApplicationsCharmsActions', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Action', request='ApplicationsCharmsActions', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -5692,28 +6570,28 @@ class ActionFacade(Type):
     @ReturnMapping(ActionResults)
     async def Cancel(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ActionResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ActionResult]<~ActionResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Action', Request='Cancel', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Action', request='Cancel', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(ActionResults)
-    async def Enqueue(self, actionspecs):
+    async def Enqueue(self, actions):
         '''
-        actionspecs : typing.Mapping[str, ~ActionSpec]
-        Returns -> typing.Sequence[~ActionResult]
+        actions : typing.Sequence<+T_co>[~Action]<~Action>
+        Returns -> typing.Sequence<+T_co>[~ActionResult]<~ActionResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Action', Request='Enqueue', Version=2, Params=params)
-        params['ActionSpecs'] = actionspecs
+        _params = dict()
+        msg = dict(type='Action', request='Enqueue', version=2, params=_params)
+        _params['actions'] = actions
         reply = await self.rpc(msg)
         return reply
 
@@ -5722,13 +6600,13 @@ class ActionFacade(Type):
     @ReturnMapping(FindTagsResults)
     async def FindActionTagsByPrefix(self, prefixes):
         '''
-        prefixes : typing.Sequence[str]
-        Returns -> typing.Sequence[~Entity]
+        prefixes : typing.Sequence<+T_co>[str]
+        Returns -> typing.Sequence<+T_co>[~Entity]<~Entity>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Action', Request='FindActionTagsByPrefix', Version=2, Params=params)
-        params['prefixes'] = prefixes
+        _params = dict()
+        msg = dict(type='Action', request='FindActionTagsByPrefix', version=2, params=_params)
+        _params['prefixes'] = prefixes
         reply = await self.rpc(msg)
         return reply
 
@@ -5737,13 +6615,13 @@ class ActionFacade(Type):
     @ReturnMapping(ActionsByNames)
     async def FindActionsByNames(self, names):
         '''
-        names : typing.Sequence[str]
-        Returns -> typing.Sequence[~ActionsByName]
+        names : typing.Sequence<+T_co>[str]
+        Returns -> typing.Sequence<+T_co>[~ActionsByName]<~ActionsByName>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Action', Request='FindActionsByNames', Version=2, Params=params)
-        params['names'] = names
+        _params = dict()
+        msg = dict(type='Action', request='FindActionsByNames', version=2, params=_params)
+        _params['names'] = names
         reply = await self.rpc(msg)
         return reply
 
@@ -5752,13 +6630,13 @@ class ActionFacade(Type):
     @ReturnMapping(ActionsByReceivers)
     async def ListAll(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ActionsByReceiver]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ActionsByReceiver]<~ActionsByReceiver>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Action', Request='ListAll', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Action', request='ListAll', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -5767,13 +6645,13 @@ class ActionFacade(Type):
     @ReturnMapping(ActionsByReceivers)
     async def ListCompleted(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ActionsByReceiver]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ActionsByReceiver]<~ActionsByReceiver>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Action', Request='ListCompleted', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Action', request='ListCompleted', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -5782,13 +6660,13 @@ class ActionFacade(Type):
     @ReturnMapping(ActionsByReceivers)
     async def ListPending(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ActionsByReceiver]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ActionsByReceiver]<~ActionsByReceiver>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Action', Request='ListPending', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Action', request='ListPending', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -5797,13 +6675,13 @@ class ActionFacade(Type):
     @ReturnMapping(ActionsByReceivers)
     async def ListRunning(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ActionsByReceiver]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ActionsByReceiver]<~ActionsByReceiver>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Action', Request='ListRunning', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Action', request='ListRunning', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -5812,21 +6690,21 @@ class ActionFacade(Type):
     @ReturnMapping(ActionResults)
     async def Run(self, applications, commands, machines, timeout, units):
         '''
-        applications : typing.Sequence[str]
+        applications : typing.Sequence<+T_co>[str]
         commands : str
-        machines : typing.Sequence[str]
+        machines : typing.Sequence<+T_co>[str]
         timeout : int
-        units : typing.Sequence[str]
-        Returns -> typing.Sequence[~ActionResult]
+        units : typing.Sequence<+T_co>[str]
+        Returns -> typing.Sequence<+T_co>[~ActionResult]<~ActionResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Action', Request='Run', Version=2, Params=params)
-        params['Applications'] = applications
-        params['Commands'] = commands
-        params['Machines'] = machines
-        params['Timeout'] = timeout
-        params['Units'] = units
+        _params = dict()
+        msg = dict(type='Action', request='Run', version=2, params=_params)
+        _params['applications'] = applications
+        _params['commands'] = commands
+        _params['machines'] = machines
+        _params['timeout'] = timeout
+        _params['units'] = units
         reply = await self.rpc(msg)
         return reply
 
@@ -5835,134 +6713,21 @@ class ActionFacade(Type):
     @ReturnMapping(ActionResults)
     async def RunOnAllMachines(self, applications, commands, machines, timeout, units):
         '''
-        applications : typing.Sequence[str]
+        applications : typing.Sequence<+T_co>[str]
         commands : str
-        machines : typing.Sequence[str]
+        machines : typing.Sequence<+T_co>[str]
         timeout : int
-        units : typing.Sequence[str]
-        Returns -> typing.Sequence[~ActionResult]
-        '''
-        # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Action', Request='RunOnAllMachines', Version=2, Params=params)
-        params['Applications'] = applications
-        params['Commands'] = commands
-        params['Machines'] = machines
-        params['Timeout'] = timeout
-        params['Units'] = units
-        reply = await self.rpc(msg)
-        return reply
-
-
-class AddresserFacade(Type):
-    name = 'Addresser'
-    version = 2
-    schema =     {'definitions': {'BoolResult': {'additionalProperties': False,
-                                    'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                   'Result': {'type': 'boolean'}},
-                                    'required': ['Error', 'Result'],
-                                    'type': 'object'},
-                     'EntitiesWatchResult': {'additionalProperties': False,
-                                             'properties': {'Changes': {'items': {'type': 'string'},
-                                                                        'type': 'array'},
-                                                            'EntityWatcherId': {'type': 'string'},
-                                                            'Error': {'$ref': '#/definitions/Error'}},
-                                             'required': ['EntityWatcherId',
-                                                          'Changes',
-                                                          'Error'],
-                                             'type': 'object'},
-                     'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
-                               'type': 'object'},
-                     'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
-                                   'type': 'object'},
-                     'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
-                                     'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
-     'properties': {'CanDeallocateAddresses': {'properties': {'Result': {'$ref': '#/definitions/BoolResult'}},
-                                               'type': 'object'},
-                    'CleanupIPAddresses': {'properties': {'Result': {'$ref': '#/definitions/ErrorResult'}},
-                                           'type': 'object'},
-                    'WatchIPAddresses': {'properties': {'Result': {'$ref': '#/definitions/EntitiesWatchResult'}},
-                                         'type': 'object'}},
-     'type': 'object'}
-    
-
-    @ReturnMapping(BoolResult)
-    async def CanDeallocateAddresses(self):
-        '''
-
-        Returns -> typing.Union[_ForwardRef('Error'), bool]
-        '''
-        # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Addresser', Request='CanDeallocateAddresses', Version=2, Params=params)
-
-        reply = await self.rpc(msg)
-        return reply
-
-
-
-    @ReturnMapping(ErrorResult)
-    async def CleanupIPAddresses(self):
-        '''
-
-        Returns -> Error
-        '''
-        # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Addresser', Request='CleanupIPAddresses', Version=2, Params=params)
-
-        reply = await self.rpc(msg)
-        return reply
-
-
-
-    @ReturnMapping(EntitiesWatchResult)
-    async def WatchIPAddresses(self):
-        '''
-
-        Returns -> typing.Union[typing.Sequence[str], _ForwardRef('Error')]
+        units : typing.Sequence<+T_co>[str]
+        Returns -> typing.Sequence<+T_co>[~ActionResult]<~ActionResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Addresser', Request='WatchIPAddresses', Version=2, Params=params)
-
+        _params = dict()
+        msg = dict(type='Action', request='RunOnAllMachines', version=2, params=_params)
+        _params['applications'] = applications
+        _params['commands'] = commands
+        _params['machines'] = machines
+        _params['timeout'] = timeout
+        _params['units'] = units
         reply = await self.rpc(msg)
         return reply
 
@@ -5971,122 +6736,138 @@ class AgentFacade(Type):
     name = 'Agent'
     version = 2
     schema =     {'definitions': {'AgentGetEntitiesResult': {'additionalProperties': False,
-                                                'properties': {'ContainerType': {'type': 'string'},
-                                                               'Error': {'$ref': '#/definitions/Error'},
-                                                               'Jobs': {'items': {'type': 'string'},
+                                                'properties': {'container-type': {'type': 'string'},
+                                                               'error': {'$ref': '#/definitions/Error'},
+                                                               'jobs': {'items': {'type': 'string'},
                                                                         'type': 'array'},
-                                                               'Life': {'type': 'string'}},
-                                                'required': ['Life',
-                                                             'Jobs',
-                                                             'ContainerType',
-                                                             'Error'],
+                                                               'life': {'type': 'string'}},
+                                                'required': ['life',
+                                                             'jobs',
+                                                             'container-type'],
                                                 'type': 'object'},
                      'AgentGetEntitiesResults': {'additionalProperties': False,
-                                                 'properties': {'Entities': {'items': {'$ref': '#/definitions/AgentGetEntitiesResult'},
+                                                 'properties': {'entities': {'items': {'$ref': '#/definitions/AgentGetEntitiesResult'},
                                                                              'type': 'array'}},
-                                                 'required': ['Entities'],
+                                                 'required': ['entities'],
                                                  'type': 'object'},
+                     'CloudCredential': {'additionalProperties': False,
+                                         'properties': {'attrs': {'patternProperties': {'.*': {'type': 'string'}},
+                                                                  'type': 'object'},
+                                                        'auth-type': {'type': 'string'},
+                                                        'redacted': {'items': {'type': 'string'},
+                                                                     'type': 'array'}},
+                                         'required': ['auth-type'],
+                                         'type': 'object'},
+                     'CloudSpec': {'additionalProperties': False,
+                                   'properties': {'credential': {'$ref': '#/definitions/CloudCredential'},
+                                                  'endpoint': {'type': 'string'},
+                                                  'identity-endpoint': {'type': 'string'},
+                                                  'name': {'type': 'string'},
+                                                  'region': {'type': 'string'},
+                                                  'storage-endpoint': {'type': 'string'},
+                                                  'type': {'type': 'string'}},
+                                   'required': ['type', 'name'],
+                                   'type': 'object'},
+                     'CloudSpecResult': {'additionalProperties': False,
+                                         'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                        'result': {'$ref': '#/definitions/CloudSpec'}},
+                                         'type': 'object'},
+                     'CloudSpecResults': {'additionalProperties': False,
+                                          'properties': {'results': {'items': {'$ref': '#/definitions/CloudSpecResult'},
+                                                                     'type': 'array'}},
+                                          'type': 'object'},
+                     'ControllerConfigResult': {'additionalProperties': False,
+                                                'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                                                                                       'type': 'object'}},
+                                                                          'type': 'object'}},
+                                                'required': ['config'],
+                                                'type': 'object'},
                      'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'EntityPassword': {'additionalProperties': False,
-                                        'properties': {'Password': {'type': 'string'},
-                                                       'Tag': {'type': 'string'}},
-                                        'required': ['Tag', 'Password'],
+                                        'properties': {'password': {'type': 'string'},
+                                                       'tag': {'type': 'string'}},
+                                        'required': ['tag', 'password'],
                                         'type': 'object'},
                      'EntityPasswords': {'additionalProperties': False,
-                                         'properties': {'Changes': {'items': {'$ref': '#/definitions/EntityPassword'},
+                                         'properties': {'changes': {'items': {'$ref': '#/definitions/EntityPassword'},
                                                                     'type': 'array'}},
-                                         'required': ['Changes'],
+                                         'required': ['changes'],
                                          'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'IsMasterResult': {'additionalProperties': False,
-                                        'properties': {'Master': {'type': 'boolean'}},
-                                        'required': ['Master'],
+                                        'properties': {'master': {'type': 'boolean'}},
+                                        'required': ['master'],
                                         'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'ModelConfigResult': {'additionalProperties': False,
-                                           'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                           'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                   'type': 'object'}},
                                                                      'type': 'object'}},
-                                           'required': ['Config'],
+                                           'required': ['config'],
                                            'type': 'object'},
+                     'ModelTag': {'additionalProperties': False, 'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
+                     'NotifyWatchResults': {'additionalProperties': False,
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
+                                                                       'type': 'array'}},
+                                            'required': ['results'],
+                                            'type': 'object'},
                      'StateServingInfo': {'additionalProperties': False,
-                                          'properties': {'APIPort': {'type': 'integer'},
-                                                         'CAPrivateKey': {'type': 'string'},
-                                                         'Cert': {'type': 'string'},
-                                                         'PrivateKey': {'type': 'string'},
-                                                         'SharedSecret': {'type': 'string'},
-                                                         'StatePort': {'type': 'integer'},
-                                                         'SystemIdentity': {'type': 'string'}},
-                                          'required': ['APIPort',
-                                                       'StatePort',
-                                                       'Cert',
-                                                       'PrivateKey',
-                                                       'CAPrivateKey',
-                                                       'SharedSecret',
-                                                       'SystemIdentity'],
-                                          'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                          'properties': {'api-port': {'type': 'integer'},
+                                                         'ca-private-key': {'type': 'string'},
+                                                         'cert': {'type': 'string'},
+                                                         'private-key': {'type': 'string'},
+                                                         'shared-secret': {'type': 'string'},
+                                                         'state-port': {'type': 'integer'},
+                                                         'system-identity': {'type': 'string'}},
+                                          'required': ['api-port',
+                                                       'state-port',
+                                                       'cert',
+                                                       'private-key',
+                                                       'ca-private-key',
+                                                       'shared-secret',
+                                                       'system-identity'],
+                                          'type': 'object'}},
      'properties': {'ClearReboot': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                    'Result': {'$ref': '#/definitions/ErrorResults'}},
                                     'type': 'object'},
+                    'CloudSpec': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                 'Result': {'$ref': '#/definitions/CloudSpecResults'}},
+                                  'type': 'object'},
+                    'ControllerConfig': {'properties': {'Result': {'$ref': '#/definitions/ControllerConfigResult'}},
+                                         'type': 'object'},
+                    'GetCloudSpec': {'properties': {'Params': {'$ref': '#/definitions/ModelTag'},
+                                                    'Result': {'$ref': '#/definitions/CloudSpecResult'}},
+                                     'type': 'object'},
                     'GetEntities': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                    'Result': {'$ref': '#/definitions/AgentGetEntitiesResults'}},
                                     'type': 'object'},
@@ -6099,6 +6880,9 @@ class AgentFacade(Type):
                                      'type': 'object'},
                     'StateServingInfo': {'properties': {'Result': {'$ref': '#/definitions/StateServingInfo'}},
                                          'type': 'object'},
+                    'WatchCredentials': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                        'Result': {'$ref': '#/definitions/NotifyWatchResults'}},
+                                         'type': 'object'},
                     'WatchForModelConfigChanges': {'properties': {'Result': {'$ref': '#/definitions/NotifyWatchResult'}},
                                                    'type': 'object'}},
      'type': 'object'}
@@ -6107,112 +6891,172 @@ class AgentFacade(Type):
     @ReturnMapping(ErrorResults)
     async def ClearReboot(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Agent', Request='ClearReboot', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Agent', request='ClearReboot', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
-    @ReturnMapping(AgentGetEntitiesResults)
-    async def GetEntities(self, entities):
+    @ReturnMapping(CloudSpecResults)
+    async def CloudSpec(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~AgentGetEntitiesResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~CloudSpecResult]<~CloudSpecResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Agent', Request='GetEntities', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Agent', request='CloudSpec', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
-    @ReturnMapping(IsMasterResult)
-    async def IsMaster(self):
+    @ReturnMapping(ControllerConfigResult)
+    async def ControllerConfig(self):
         '''
 
-        Returns -> bool
+        Returns -> typing.Mapping<~KT, +VT_co>[str, typing.Any]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Agent', Request='IsMaster', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='Agent', request='ControllerConfig', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
 
 
 
-    @ReturnMapping(ModelConfigResult)
-    async def ModelConfig(self):
+    @ReturnMapping(CloudSpecResult)
+    async def GetCloudSpec(self):
         '''
 
-        Returns -> typing.Mapping[str, typing.Any]
+        Returns -> typing.Union[_ForwardRef('Error'), _ForwardRef('CloudSpec')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Agent', Request='ModelConfig', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='Agent', request='GetCloudSpec', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
 
 
 
-    @ReturnMapping(ErrorResults)
-    async def SetPasswords(self, changes):
+    @ReturnMapping(AgentGetEntitiesResults)
+    async def GetEntities(self, entities):
         '''
-        changes : typing.Sequence[~EntityPassword]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~AgentGetEntitiesResult]<~AgentGetEntitiesResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Agent', Request='SetPasswords', Version=2, Params=params)
-        params['Changes'] = changes
+        _params = dict()
+        msg = dict(type='Agent', request='GetEntities', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
-    @ReturnMapping(StateServingInfo)
-    async def StateServingInfo(self):
+    @ReturnMapping(IsMasterResult)
+    async def IsMaster(self):
         '''
 
-        Returns -> typing.Union[int, str]
+        Returns -> bool
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Agent', Request='StateServingInfo', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='Agent', request='IsMaster', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
 
 
 
-    @ReturnMapping(NotifyWatchResult)
-    async def WatchForModelConfigChanges(self):
+    @ReturnMapping(ModelConfigResult)
+    async def ModelConfig(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), str]
+        Returns -> typing.Mapping<~KT, +VT_co>[str, typing.Any]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Agent', Request='WatchForModelConfigChanges', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='Agent', request='ModelConfig', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
 
 
-class AgentToolsFacade(Type):
-    name = 'AgentTools'
-    version = 1
-    schema =     {'properties': {'UpdateToolsAvailable': {'type': 'object'}}, 'type': 'object'}
-    
+
+    @ReturnMapping(ErrorResults)
+    async def SetPasswords(self, changes):
+        '''
+        changes : typing.Sequence<+T_co>[~EntityPassword]<~EntityPassword>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Agent', request='SetPasswords', version=2, params=_params)
+        _params['changes'] = changes
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(StateServingInfo)
+    async def StateServingInfo(self):
+        '''
+
+        Returns -> typing.Union[int, str]
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Agent', request='StateServingInfo', version=2, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(NotifyWatchResults)
+    async def WatchCredentials(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Agent', request='WatchCredentials', version=2, params=_params)
+        _params['entities'] = entities
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(NotifyWatchResult)
+    async def WatchForModelConfigChanges(self):
+        '''
+
+        Returns -> typing.Union[str, _ForwardRef('Error')]
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Agent', request='WatchForModelConfigChanges', version=2, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
+class AgentToolsFacade(Type):
+    name = 'AgentTools'
+    version = 1
+    schema =     {'properties': {'UpdateToolsAvailable': {'type': 'object'}}, 'type': 'object'}
+    
 
     @ReturnMapping(None)
     async def UpdateToolsAvailable(self):
@@ -6221,8 +7065,8 @@ class AgentToolsFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='AgentTools', Request='UpdateToolsAvailable', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='AgentTools', request='UpdateToolsAvailable', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -6232,15 +7076,15 @@ class AllModelWatcherFacade(Type):
     name = 'AllModelWatcher'
     version = 2
     schema =     {'definitions': {'AllWatcherNextResults': {'additionalProperties': False,
-                                               'properties': {'Deltas': {'items': {'$ref': '#/definitions/Delta'},
+                                               'properties': {'deltas': {'items': {'$ref': '#/definitions/Delta'},
                                                                          'type': 'array'}},
-                                               'required': ['Deltas'],
+                                               'required': ['deltas'],
                                                'type': 'object'},
                      'Delta': {'additionalProperties': False,
-                               'properties': {'Entity': {'additionalProperties': True,
+                               'properties': {'entity': {'additionalProperties': True,
                                                          'type': 'object'},
-                                              'Removed': {'type': 'boolean'}},
-                               'required': ['Removed', 'Entity'],
+                                              'removed': {'type': 'boolean'}},
+                               'required': ['removed', 'entity'],
                                'type': 'object'}},
      'properties': {'Next': {'properties': {'Result': {'$ref': '#/definitions/AllWatcherNextResults'}},
                              'type': 'object'},
@@ -6252,11 +7096,11 @@ class AllModelWatcherFacade(Type):
     async def Next(self):
         '''
 
-        Returns -> typing.Sequence[~Delta]
+        Returns -> typing.Sequence<+T_co>[~Delta]<~Delta>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='AllModelWatcher', Request='Next', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='AllModelWatcher', request='Next', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -6270,8 +7114,8 @@ class AllModelWatcherFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='AllModelWatcher', Request='Stop', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='AllModelWatcher', request='Stop', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -6281,15 +7125,15 @@ class AllWatcherFacade(Type):
     name = 'AllWatcher'
     version = 1
     schema =     {'definitions': {'AllWatcherNextResults': {'additionalProperties': False,
-                                               'properties': {'Deltas': {'items': {'$ref': '#/definitions/Delta'},
+                                               'properties': {'deltas': {'items': {'$ref': '#/definitions/Delta'},
                                                                          'type': 'array'}},
-                                               'required': ['Deltas'],
+                                               'required': ['deltas'],
                                                'type': 'object'},
                      'Delta': {'additionalProperties': False,
-                               'properties': {'Entity': {'additionalProperties': True,
+                               'properties': {'entity': {'additionalProperties': True,
                                                          'type': 'object'},
-                                              'Removed': {'type': 'boolean'}},
-                               'required': ['Removed', 'Entity'],
+                                              'removed': {'type': 'boolean'}},
+                               'required': ['removed', 'entity'],
                                'type': 'object'}},
      'properties': {'Next': {'properties': {'Result': {'$ref': '#/definitions/AllWatcherNextResults'}},
                              'type': 'object'},
@@ -6301,11 +7145,11 @@ class AllWatcherFacade(Type):
     async def Next(self):
         '''
 
-        Returns -> typing.Sequence[~Delta]
+        Returns -> typing.Sequence<+T_co>[~Delta]<~Delta>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='AllWatcher', Request='Next', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='AllWatcher', request='Next', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -6319,8 +7163,8 @@ class AllWatcherFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='AllWatcher', Request='Stop', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='AllWatcher', request='Stop', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -6330,87 +7174,56 @@ class AnnotationsFacade(Type):
     name = 'Annotations'
     version = 2
     schema =     {'definitions': {'AnnotationsGetResult': {'additionalProperties': False,
-                                              'properties': {'Annotations': {'patternProperties': {'.*': {'type': 'string'}},
+                                              'properties': {'annotations': {'patternProperties': {'.*': {'type': 'string'}},
                                                                              'type': 'object'},
-                                                             'EntityTag': {'type': 'string'},
-                                                             'Error': {'$ref': '#/definitions/ErrorResult'}},
-                                              'required': ['EntityTag',
-                                                           'Annotations',
-                                                           'Error'],
+                                                             'entity': {'type': 'string'},
+                                                             'error': {'$ref': '#/definitions/ErrorResult'}},
+                                              'required': ['entity', 'annotations'],
                                               'type': 'object'},
                      'AnnotationsGetResults': {'additionalProperties': False,
-                                               'properties': {'Results': {'items': {'$ref': '#/definitions/AnnotationsGetResult'},
+                                               'properties': {'results': {'items': {'$ref': '#/definitions/AnnotationsGetResult'},
                                                                           'type': 'array'}},
-                                               'required': ['Results'],
+                                               'required': ['results'],
                                                'type': 'object'},
                      'AnnotationsSet': {'additionalProperties': False,
-                                        'properties': {'Annotations': {'items': {'$ref': '#/definitions/EntityAnnotations'},
+                                        'properties': {'annotations': {'items': {'$ref': '#/definitions/EntityAnnotations'},
                                                                        'type': 'array'}},
-                                        'required': ['Annotations'],
+                                        'required': ['annotations'],
                                         'type': 'object'},
                      'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'EntityAnnotations': {'additionalProperties': False,
-                                           'properties': {'Annotations': {'patternProperties': {'.*': {'type': 'string'}},
+                                           'properties': {'annotations': {'patternProperties': {'.*': {'type': 'string'}},
                                                                           'type': 'object'},
-                                                          'EntityTag': {'type': 'string'}},
-                                           'required': ['EntityTag', 'Annotations'],
+                                                          'entity': {'type': 'string'}},
+                                           'required': ['entity', 'annotations'],
                                            'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'}},
      'properties': {'Get': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                            'Result': {'$ref': '#/definitions/AnnotationsGetResults'}},
                             'type': 'object'},
@@ -6423,13 +7236,13 @@ class AnnotationsFacade(Type):
     @ReturnMapping(AnnotationsGetResults)
     async def Get(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~AnnotationsGetResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~AnnotationsGetResult]<~AnnotationsGetResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Annotations', Request='Get', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Annotations', request='Get', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -6438,176 +7251,187 @@ class AnnotationsFacade(Type):
     @ReturnMapping(ErrorResults)
     async def Set(self, annotations):
         '''
-        annotations : typing.Sequence[~EntityAnnotations]
-        Returns -> typing.Sequence[~ErrorResult]
+        annotations : typing.Sequence<+T_co>[~EntityAnnotations]<~EntityAnnotations>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Annotations', Request='Set', Version=2, Params=params)
-        params['Annotations'] = annotations
+        _params = dict()
+        msg = dict(type='Annotations', request='Set', version=2, params=_params)
+        _params['annotations'] = annotations
         reply = await self.rpc(msg)
         return reply
 
 
 class ApplicationFacade(Type):
     name = 'Application'
-    version = 1
+    version = 3
     schema =     {'definitions': {'AddApplicationUnits': {'additionalProperties': False,
-                                             'properties': {'ApplicationName': {'type': 'string'},
-                                                            'NumUnits': {'type': 'integer'},
-                                                            'Placement': {'items': {'$ref': '#/definitions/Placement'},
+                                             'properties': {'application': {'type': 'string'},
+                                                            'num-units': {'type': 'integer'},
+                                                            'placement': {'items': {'$ref': '#/definitions/Placement'},
                                                                           'type': 'array'}},
-                                             'required': ['ApplicationName',
-                                                          'NumUnits',
-                                                          'Placement'],
+                                             'required': ['application',
+                                                          'num-units',
+                                                          'placement'],
                                              'type': 'object'},
                      'AddApplicationUnitsResults': {'additionalProperties': False,
-                                                    'properties': {'Units': {'items': {'type': 'string'},
+                                                    'properties': {'units': {'items': {'type': 'string'},
                                                                              'type': 'array'}},
-                                                    'required': ['Units'],
+                                                    'required': ['units'],
                                                     'type': 'object'},
                      'AddRelation': {'additionalProperties': False,
-                                     'properties': {'Endpoints': {'items': {'type': 'string'},
+                                     'properties': {'endpoints': {'items': {'type': 'string'},
                                                                   'type': 'array'}},
-                                     'required': ['Endpoints'],
+                                     'required': ['endpoints'],
                                      'type': 'object'},
                      'AddRelationResults': {'additionalProperties': False,
-                                            'properties': {'Endpoints': {'patternProperties': {'.*': {'$ref': '#/definitions/Relation'}},
+                                            'properties': {'endpoints': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmRelation'}},
                                                                          'type': 'object'}},
-                                            'required': ['Endpoints'],
+                                            'required': ['endpoints'],
                                             'type': 'object'},
                      'ApplicationCharmRelations': {'additionalProperties': False,
-                                                   'properties': {'ApplicationName': {'type': 'string'}},
-                                                   'required': ['ApplicationName'],
+                                                   'properties': {'application': {'type': 'string'}},
+                                                   'required': ['application'],
                                                    'type': 'object'},
                      'ApplicationCharmRelationsResults': {'additionalProperties': False,
-                                                          'properties': {'CharmRelations': {'items': {'type': 'string'},
-                                                                                            'type': 'array'}},
-                                                          'required': ['CharmRelations'],
+                                                          'properties': {'charm-relations': {'items': {'type': 'string'},
+                                                                                             'type': 'array'}},
+                                                          'required': ['charm-relations'],
                                                           'type': 'object'},
                      'ApplicationDeploy': {'additionalProperties': False,
-                                           'properties': {'ApplicationName': {'type': 'string'},
-                                                          'Channel': {'type': 'string'},
-                                                          'CharmUrl': {'type': 'string'},
-                                                          'Config': {'patternProperties': {'.*': {'type': 'string'}},
+                                           'properties': {'application': {'type': 'string'},
+                                                          'channel': {'type': 'string'},
+                                                          'charm-url': {'type': 'string'},
+                                                          'config': {'patternProperties': {'.*': {'type': 'string'}},
                                                                      'type': 'object'},
-                                                          'ConfigYAML': {'type': 'string'},
-                                                          'Constraints': {'$ref': '#/definitions/Value'},
-                                                          'EndpointBindings': {'patternProperties': {'.*': {'type': 'string'}},
-                                                                               'type': 'object'},
-                                                          'NumUnits': {'type': 'integer'},
-                                                          'Placement': {'items': {'$ref': '#/definitions/Placement'},
+                                                          'config-yaml': {'type': 'string'},
+                                                          'constraints': {'$ref': '#/definitions/Value'},
+                                                          'endpoint-bindings': {'patternProperties': {'.*': {'type': 'string'}},
+                                                                                'type': 'object'},
+                                                          'num-units': {'type': 'integer'},
+                                                          'placement': {'items': {'$ref': '#/definitions/Placement'},
                                                                         'type': 'array'},
-                                                          'Resources': {'patternProperties': {'.*': {'type': 'string'}},
+                                                          'resources': {'patternProperties': {'.*': {'type': 'string'}},
                                                                         'type': 'object'},
-                                                          'Series': {'type': 'string'},
-                                                          'Storage': {'patternProperties': {'.*': {'$ref': '#/definitions/Constraints'}},
+                                                          'series': {'type': 'string'},
+                                                          'storage': {'patternProperties': {'.*': {'$ref': '#/definitions/Constraints'}},
                                                                       'type': 'object'}},
-                                           'required': ['ApplicationName',
-                                                        'Series',
-                                                        'CharmUrl',
-                                                        'Channel',
-                                                        'NumUnits',
-                                                        'Config',
-                                                        'ConfigYAML',
-                                                        'Constraints',
-                                                        'Placement',
-                                                        'Storage',
-                                                        'EndpointBindings',
-                                                        'Resources'],
+                                           'required': ['application',
+                                                        'series',
+                                                        'charm-url',
+                                                        'channel',
+                                                        'num-units',
+                                                        'config-yaml',
+                                                        'constraints'],
                                            'type': 'object'},
                      'ApplicationDestroy': {'additionalProperties': False,
-                                            'properties': {'ApplicationName': {'type': 'string'}},
-                                            'required': ['ApplicationName'],
+                                            'properties': {'application': {'type': 'string'}},
+                                            'required': ['application'],
                                             'type': 'object'},
                      'ApplicationExpose': {'additionalProperties': False,
-                                           'properties': {'ApplicationName': {'type': 'string'}},
-                                           'required': ['ApplicationName'],
+                                           'properties': {'application': {'type': 'string'}},
+                                           'required': ['application'],
                                            'type': 'object'},
                      'ApplicationGet': {'additionalProperties': False,
-                                        'properties': {'ApplicationName': {'type': 'string'}},
-                                        'required': ['ApplicationName'],
+                                        'properties': {'application': {'type': 'string'}},
+                                        'required': ['application'],
                                         'type': 'object'},
                      'ApplicationGetResults': {'additionalProperties': False,
-                                               'properties': {'Application': {'type': 'string'},
-                                                              'Charm': {'type': 'string'},
-                                                              'Config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                               'properties': {'application': {'type': 'string'},
+                                                              'charm': {'type': 'string'},
+                                                              'config': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                       'type': 'object'}},
                                                                          'type': 'object'},
-                                                              'Constraints': {'$ref': '#/definitions/Value'}},
-                                               'required': ['Application',
-                                                            'Charm',
-                                                            'Config',
-                                                            'Constraints'],
+                                                              'constraints': {'$ref': '#/definitions/Value'},
+                                                              'series': {'type': 'string'}},
+                                               'required': ['application',
+                                                            'charm',
+                                                            'config',
+                                                            'constraints',
+                                                            'series'],
                                                'type': 'object'},
                      'ApplicationMetricCredential': {'additionalProperties': False,
-                                                     'properties': {'ApplicationName': {'type': 'string'},
-                                                                    'MetricCredentials': {'items': {'type': 'integer'},
-                                                                                          'type': 'array'}},
-                                                     'required': ['ApplicationName',
-                                                                  'MetricCredentials'],
+                                                     'properties': {'application': {'type': 'string'},
+                                                                    'metrics-credentials': {'items': {'type': 'integer'},
+                                                                                            'type': 'array'}},
+                                                     'required': ['application',
+                                                                  'metrics-credentials'],
                                                      'type': 'object'},
                      'ApplicationMetricCredentials': {'additionalProperties': False,
-                                                      'properties': {'Creds': {'items': {'$ref': '#/definitions/ApplicationMetricCredential'},
+                                                      'properties': {'creds': {'items': {'$ref': '#/definitions/ApplicationMetricCredential'},
                                                                                'type': 'array'}},
-                                                      'required': ['Creds'],
+                                                      'required': ['creds'],
                                                       'type': 'object'},
                      'ApplicationSet': {'additionalProperties': False,
-                                        'properties': {'ApplicationName': {'type': 'string'},
-                                                       'Options': {'patternProperties': {'.*': {'type': 'string'}},
+                                        'properties': {'application': {'type': 'string'},
+                                                       'options': {'patternProperties': {'.*': {'type': 'string'}},
                                                                    'type': 'object'}},
-                                        'required': ['ApplicationName', 'Options'],
+                                        'required': ['application', 'options'],
                                         'type': 'object'},
                      'ApplicationSetCharm': {'additionalProperties': False,
-                                             'properties': {'applicationname': {'type': 'string'},
-                                                            'charmurl': {'type': 'string'},
-                                                            'cs-channel': {'type': 'string'},
-                                                            'forceseries': {'type': 'boolean'},
-                                                            'forceunits': {'type': 'boolean'},
-                                                            'resourceids': {'patternProperties': {'.*': {'type': 'string'}},
-                                                                            'type': 'object'}},
-                                             'required': ['applicationname',
-                                                          'charmurl',
-                                                          'cs-channel',
-                                                          'forceunits',
-                                                          'forceseries',
-                                                          'resourceids'],
+                                             'properties': {'application': {'type': 'string'},
+                                                            'channel': {'type': 'string'},
+                                                            'charm-url': {'type': 'string'},
+                                                            'config-settings': {'patternProperties': {'.*': {'type': 'string'}},
+                                                                                'type': 'object'},
+                                                            'config-settings-yaml': {'type': 'string'},
+                                                            'force-series': {'type': 'boolean'},
+                                                            'force-units': {'type': 'boolean'},
+                                                            'resource-ids': {'patternProperties': {'.*': {'type': 'string'}},
+                                                                             'type': 'object'},
+                                                            'storage-constraints': {'patternProperties': {'.*': {'$ref': '#/definitions/StorageConstraints'}},
+                                                                                    'type': 'object'}},
+                                             'required': ['application',
+                                                          'charm-url',
+                                                          'channel',
+                                                          'force-units',
+                                                          'force-series'],
                                              'type': 'object'},
                      'ApplicationUnexpose': {'additionalProperties': False,
-                                             'properties': {'ApplicationName': {'type': 'string'}},
-                                             'required': ['ApplicationName'],
+                                             'properties': {'application': {'type': 'string'}},
+                                             'required': ['application'],
                                              'type': 'object'},
                      'ApplicationUnset': {'additionalProperties': False,
-                                          'properties': {'ApplicationName': {'type': 'string'},
-                                                         'Options': {'items': {'type': 'string'},
+                                          'properties': {'application': {'type': 'string'},
+                                                         'options': {'items': {'type': 'string'},
                                                                      'type': 'array'}},
-                                          'required': ['ApplicationName',
-                                                       'Options'],
+                                          'required': ['application', 'options'],
                                           'type': 'object'},
                      'ApplicationUpdate': {'additionalProperties': False,
-                                           'properties': {'ApplicationName': {'type': 'string'},
-                                                          'CharmUrl': {'type': 'string'},
-                                                          'Constraints': {'$ref': '#/definitions/Value'},
-                                                          'ForceCharmUrl': {'type': 'boolean'},
-                                                          'ForceSeries': {'type': 'boolean'},
-                                                          'MinUnits': {'type': 'integer'},
-                                                          'SettingsStrings': {'patternProperties': {'.*': {'type': 'string'}},
-                                                                              'type': 'object'},
-                                                          'SettingsYAML': {'type': 'string'}},
-                                           'required': ['ApplicationName',
-                                                        'CharmUrl',
-                                                        'ForceCharmUrl',
-                                                        'ForceSeries',
-                                                        'MinUnits',
-                                                        'SettingsStrings',
-                                                        'SettingsYAML',
-                                                        'Constraints'],
+                                           'properties': {'application': {'type': 'string'},
+                                                          'charm-url': {'type': 'string'},
+                                                          'constraints': {'$ref': '#/definitions/Value'},
+                                                          'force-charm-url': {'type': 'boolean'},
+                                                          'force-series': {'type': 'boolean'},
+                                                          'min-units': {'type': 'integer'},
+                                                          'settings': {'patternProperties': {'.*': {'type': 'string'}},
+                                                                       'type': 'object'},
+                                                          'settings-yaml': {'type': 'string'}},
+                                           'required': ['application',
+                                                        'charm-url',
+                                                        'force-charm-url',
+                                                        'force-series',
+                                                        'settings-yaml'],
                                            'type': 'object'},
                      'ApplicationsDeploy': {'additionalProperties': False,
-                                            'properties': {'Applications': {'items': {'$ref': '#/definitions/ApplicationDeploy'},
+                                            'properties': {'applications': {'items': {'$ref': '#/definitions/ApplicationDeploy'},
                                                                             'type': 'array'}},
-                                            'required': ['Applications'],
+                                            'required': ['applications'],
                                             'type': 'object'},
+                     'CharmRelation': {'additionalProperties': False,
+                                       'properties': {'interface': {'type': 'string'},
+                                                      'limit': {'type': 'integer'},
+                                                      'name': {'type': 'string'},
+                                                      'optional': {'type': 'boolean'},
+                                                      'role': {'type': 'string'},
+                                                      'scope': {'type': 'string'}},
+                                       'required': ['name',
+                                                    'role',
+                                                    'interface',
+                                                    'optional',
+                                                    'limit',
+                                                    'scope'],
+                                       'type': 'object'},
                      'Constraints': {'additionalProperties': False,
                                      'properties': {'Count': {'type': 'integer'},
                                                     'Pool': {'type': 'string'},
@@ -6615,91 +7439,66 @@ class ApplicationFacade(Type):
                                      'required': ['Pool', 'Size', 'Count'],
                                      'type': 'object'},
                      'DestroyApplicationUnits': {'additionalProperties': False,
-                                                 'properties': {'UnitNames': {'items': {'type': 'string'},
-                                                                              'type': 'array'}},
-                                                 'required': ['UnitNames'],
+                                                 'properties': {'unit-names': {'items': {'type': 'string'},
+                                                                               'type': 'array'}},
+                                                 'required': ['unit-names'],
                                                  'type': 'object'},
                      'DestroyRelation': {'additionalProperties': False,
-                                         'properties': {'Endpoints': {'items': {'type': 'string'},
+                                         'properties': {'endpoints': {'items': {'type': 'string'},
                                                                       'type': 'array'}},
-                                         'required': ['Endpoints'],
+                                         'required': ['endpoints'],
                                          'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'GetApplicationConstraints': {'additionalProperties': False,
-                                                   'properties': {'ApplicationName': {'type': 'string'}},
-                                                   'required': ['ApplicationName'],
+                                                   'properties': {'application': {'type': 'string'}},
+                                                   'required': ['application'],
                                                    'type': 'object'},
                      'GetConstraintsResults': {'additionalProperties': False,
-                                               'properties': {'Constraints': {'$ref': '#/definitions/Value'}},
-                                               'required': ['Constraints'],
+                                               'properties': {'constraints': {'$ref': '#/definitions/Value'}},
+                                               'required': ['constraints'],
                                                'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'Placement': {'additionalProperties': False,
-                                   'properties': {'Directive': {'type': 'string'},
-                                                  'Scope': {'type': 'string'}},
-                                   'required': ['Scope', 'Directive'],
+                                   'properties': {'directive': {'type': 'string'},
+                                                  'scope': {'type': 'string'}},
+                                   'required': ['scope', 'directive'],
                                    'type': 'object'},
-                     'Relation': {'additionalProperties': False,
-                                  'properties': {'Interface': {'type': 'string'},
-                                                 'Limit': {'type': 'integer'},
-                                                 'Name': {'type': 'string'},
-                                                 'Optional': {'type': 'boolean'},
-                                                 'Role': {'type': 'string'},
-                                                 'Scope': {'type': 'string'}},
-                                  'required': ['Name',
-                                               'Role',
-                                               'Interface',
-                                               'Optional',
-                                               'Limit',
-                                               'Scope'],
-                                  'type': 'object'},
                      'SetConstraints': {'additionalProperties': False,
-                                        'properties': {'ApplicationName': {'type': 'string'},
-                                                       'Constraints': {'$ref': '#/definitions/Value'}},
-                                        'required': ['ApplicationName',
-                                                     'Constraints'],
+                                        'properties': {'application': {'type': 'string'},
+                                                       'constraints': {'$ref': '#/definitions/Value'}},
+                                        'required': ['application', 'constraints'],
                                         'type': 'object'},
+                     'StorageConstraints': {'additionalProperties': False,
+                                            'properties': {'count': {'type': 'integer'},
+                                                           'pool': {'type': 'string'},
+                                                           'size': {'type': 'integer'}},
+                                            'type': 'object'},
                      'StringResult': {'additionalProperties': False,
-                                      'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                     'Result': {'type': 'string'}},
-                                      'required': ['Error', 'Result'],
+                                      'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                     'result': {'type': 'string'}},
+                                      'required': ['result'],
                                       'type': 'object'},
                      'Value': {'additionalProperties': False,
                                'properties': {'arch': {'type': 'string'},
                                               'container': {'type': 'string'},
-                                              'cpu-cores': {'type': 'integer'},
+                                              'cores': {'type': 'integer'},
                                               'cpu-power': {'type': 'integer'},
                                               'instance-type': {'type': 'string'},
                                               'mem': {'type': 'integer'},
@@ -6709,21 +7508,7 @@ class ApplicationFacade(Type):
                                               'tags': {'items': {'type': 'string'},
                                                        'type': 'array'},
                                               'virt-type': {'type': 'string'}},
-                               'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                               'type': 'object'}},
      'properties': {'AddRelation': {'properties': {'Params': {'$ref': '#/definitions/AddRelation'},
                                                    'Result': {'$ref': '#/definitions/AddRelationResults'}},
                                     'type': 'object'},
@@ -6774,47 +7559,47 @@ class ApplicationFacade(Type):
     @ReturnMapping(AddRelationResults)
     async def AddRelation(self, endpoints):
         '''
-        endpoints : typing.Sequence[str]
-        Returns -> typing.Mapping[str, ~Relation]
+        endpoints : typing.Sequence<+T_co>[str]
+        Returns -> typing.Mapping<~KT, +VT_co>[str, ~CharmRelation]<~CharmRelation>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='AddRelation', Version=1, Params=params)
-        params['Endpoints'] = endpoints
+        _params = dict()
+        msg = dict(type='Application', request='AddRelation', version=3, params=_params)
+        _params['endpoints'] = endpoints
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(AddApplicationUnitsResults)
-    async def AddUnits(self, applicationname, numunits, placement):
+    async def AddUnits(self, application, num_units, placement):
         '''
-        applicationname : str
-        numunits : int
-        placement : typing.Sequence[~Placement]
-        Returns -> typing.Sequence[str]
+        application : str
+        num_units : int
+        placement : typing.Sequence<+T_co>[~Placement]<~Placement>
+        Returns -> typing.Sequence<+T_co>[str]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='AddUnits', Version=1, Params=params)
-        params['ApplicationName'] = applicationname
-        params['NumUnits'] = numunits
-        params['Placement'] = placement
+        _params = dict()
+        msg = dict(type='Application', request='AddUnits', version=3, params=_params)
+        _params['application'] = application
+        _params['num-units'] = num_units
+        _params['placement'] = placement
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(ApplicationCharmRelationsResults)
-    async def CharmRelations(self, applicationname):
+    async def CharmRelations(self, application):
         '''
-        applicationname : str
-        Returns -> typing.Sequence[str]
+        application : str
+        Returns -> typing.Sequence<+T_co>[str]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='CharmRelations', Version=1, Params=params)
-        params['ApplicationName'] = applicationname
+        _params = dict()
+        msg = dict(type='Application', request='CharmRelations', version=3, params=_params)
+        _params['application'] = application
         reply = await self.rpc(msg)
         return reply
 
@@ -6823,28 +7608,28 @@ class ApplicationFacade(Type):
     @ReturnMapping(ErrorResults)
     async def Deploy(self, applications):
         '''
-        applications : typing.Sequence[~ApplicationDeploy]
-        Returns -> typing.Sequence[~ErrorResult]
+        applications : typing.Sequence<+T_co>[~ApplicationDeploy]<~ApplicationDeploy>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='Deploy', Version=1, Params=params)
-        params['Applications'] = applications
+        _params = dict()
+        msg = dict(type='Application', request='Deploy', version=3, params=_params)
+        _params['applications'] = applications
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(None)
-    async def Destroy(self, applicationname):
+    async def Destroy(self, application):
         '''
-        applicationname : str
+        application : str
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='Destroy', Version=1, Params=params)
-        params['ApplicationName'] = applicationname
+        _params = dict()
+        msg = dict(type='Application', request='Destroy', version=3, params=_params)
+        _params['application'] = application
         reply = await self.rpc(msg)
         return reply
 
@@ -6853,147 +7638,153 @@ class ApplicationFacade(Type):
     @ReturnMapping(None)
     async def DestroyRelation(self, endpoints):
         '''
-        endpoints : typing.Sequence[str]
+        endpoints : typing.Sequence<+T_co>[str]
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='DestroyRelation', Version=1, Params=params)
-        params['Endpoints'] = endpoints
+        _params = dict()
+        msg = dict(type='Application', request='DestroyRelation', version=3, params=_params)
+        _params['endpoints'] = endpoints
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(None)
-    async def DestroyUnits(self, unitnames):
+    async def DestroyUnits(self, unit_names):
         '''
-        unitnames : typing.Sequence[str]
+        unit_names : typing.Sequence<+T_co>[str]
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='DestroyUnits', Version=1, Params=params)
-        params['UnitNames'] = unitnames
+        _params = dict()
+        msg = dict(type='Application', request='DestroyUnits', version=3, params=_params)
+        _params['unit-names'] = unit_names
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(None)
-    async def Expose(self, applicationname):
+    async def Expose(self, application):
         '''
-        applicationname : str
+        application : str
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='Expose', Version=1, Params=params)
-        params['ApplicationName'] = applicationname
+        _params = dict()
+        msg = dict(type='Application', request='Expose', version=3, params=_params)
+        _params['application'] = application
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(ApplicationGetResults)
-    async def Get(self, applicationname):
+    async def Get(self, application):
         '''
-        applicationname : str
-        Returns -> typing.Union[str, typing.Mapping[str, typing.Any], _ForwardRef('Value')]
+        application : str
+        Returns -> typing.Union[str, typing.Mapping<~KT, +VT_co>[str, typing.Any], _ForwardRef('Value')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='Get', Version=1, Params=params)
-        params['ApplicationName'] = applicationname
+        _params = dict()
+        msg = dict(type='Application', request='Get', version=3, params=_params)
+        _params['application'] = application
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(StringResult)
-    async def GetCharmURL(self, applicationname):
+    async def GetCharmURL(self, application):
         '''
-        applicationname : str
+        application : str
         Returns -> typing.Union[_ForwardRef('Error'), str]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='GetCharmURL', Version=1, Params=params)
-        params['ApplicationName'] = applicationname
+        _params = dict()
+        msg = dict(type='Application', request='GetCharmURL', version=3, params=_params)
+        _params['application'] = application
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(GetConstraintsResults)
-    async def GetConstraints(self, applicationname):
+    async def GetConstraints(self, application):
         '''
-        applicationname : str
+        application : str
         Returns -> Value
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='GetConstraints', Version=1, Params=params)
-        params['ApplicationName'] = applicationname
+        _params = dict()
+        msg = dict(type='Application', request='GetConstraints', version=3, params=_params)
+        _params['application'] = application
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(None)
-    async def Set(self, applicationname, options):
+    async def Set(self, application, options):
         '''
-        applicationname : str
-        options : typing.Mapping[str, str]
+        application : str
+        options : typing.Mapping<~KT, +VT_co>[str, str]
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='Set', Version=1, Params=params)
-        params['ApplicationName'] = applicationname
-        params['Options'] = options
+        _params = dict()
+        msg = dict(type='Application', request='Set', version=3, params=_params)
+        _params['application'] = application
+        _params['options'] = options
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(None)
-    async def SetCharm(self, applicationname, charmurl, cs_channel, forceseries, forceunits, resourceids):
-        '''
-        applicationname : str
-        charmurl : str
-        cs_channel : str
-        forceseries : bool
-        forceunits : bool
-        resourceids : typing.Mapping[str, str]
+    async def SetCharm(self, application, channel, charm_url, config_settings, config_settings_yaml, force_series, force_units, resource_ids, storage_constraints):
+        '''
+        application : str
+        channel : str
+        charm_url : str
+        config_settings : typing.Mapping<~KT, +VT_co>[str, str]
+        config_settings_yaml : str
+        force_series : bool
+        force_units : bool
+        resource_ids : typing.Mapping<~KT, +VT_co>[str, str]
+        storage_constraints : typing.Mapping<~KT, +VT_co>[str, ~StorageConstraints]<~StorageConstraints>
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='SetCharm', Version=1, Params=params)
-        params['applicationname'] = applicationname
-        params['charmurl'] = charmurl
-        params['cs-channel'] = cs_channel
-        params['forceseries'] = forceseries
-        params['forceunits'] = forceunits
-        params['resourceids'] = resourceids
+        _params = dict()
+        msg = dict(type='Application', request='SetCharm', version=3, params=_params)
+        _params['application'] = application
+        _params['channel'] = channel
+        _params['charm-url'] = charm_url
+        _params['config-settings'] = config_settings
+        _params['config-settings-yaml'] = config_settings_yaml
+        _params['force-series'] = force_series
+        _params['force-units'] = force_units
+        _params['resource-ids'] = resource_ids
+        _params['storage-constraints'] = storage_constraints
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(None)
-    async def SetConstraints(self, applicationname, constraints):
+    async def SetConstraints(self, application, constraints):
         '''
-        applicationname : str
+        application : str
         constraints : Value
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='SetConstraints', Version=1, Params=params)
-        params['ApplicationName'] = applicationname
-        params['Constraints'] = constraints
+        _params = dict()
+        msg = dict(type='Application', request='SetConstraints', version=3, params=_params)
+        _params['application'] = application
+        _params['constraints'] = constraints
         reply = await self.rpc(msg)
         return reply
 
@@ -7002,74 +7793,149 @@ class ApplicationFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetMetricCredentials(self, creds):
         '''
-        creds : typing.Sequence[~ApplicationMetricCredential]
-        Returns -> typing.Sequence[~ErrorResult]
+        creds : typing.Sequence<+T_co>[~ApplicationMetricCredential]<~ApplicationMetricCredential>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='SetMetricCredentials', Version=1, Params=params)
-        params['Creds'] = creds
+        _params = dict()
+        msg = dict(type='Application', request='SetMetricCredentials', version=3, params=_params)
+        _params['creds'] = creds
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(None)
-    async def Unexpose(self, applicationname):
+    async def Unexpose(self, application):
         '''
-        applicationname : str
+        application : str
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='Unexpose', Version=1, Params=params)
-        params['ApplicationName'] = applicationname
+        _params = dict()
+        msg = dict(type='Application', request='Unexpose', version=3, params=_params)
+        _params['application'] = application
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(None)
-    async def Unset(self, applicationname, options):
+    async def Unset(self, application, options):
         '''
-        applicationname : str
-        options : typing.Sequence[str]
+        application : str
+        options : typing.Sequence<+T_co>[str]
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='Unset', Version=1, Params=params)
-        params['ApplicationName'] = applicationname
-        params['Options'] = options
+        _params = dict()
+        msg = dict(type='Application', request='Unset', version=3, params=_params)
+        _params['application'] = application
+        _params['options'] = options
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(None)
-    async def Update(self, applicationname, charmurl, constraints, forcecharmurl, forceseries, minunits, settingsstrings, settingsyaml):
+    async def Update(self, application, charm_url, constraints, force_charm_url, force_series, min_units, settings, settings_yaml):
         '''
-        applicationname : str
-        charmurl : str
+        application : str
+        charm_url : str
         constraints : Value
-        forcecharmurl : bool
-        forceseries : bool
-        minunits : int
-        settingsstrings : typing.Mapping[str, str]
-        settingsyaml : str
+        force_charm_url : bool
+        force_series : bool
+        min_units : int
+        settings : typing.Mapping<~KT, +VT_co>[str, str]
+        settings_yaml : str
+        Returns -> None
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Application', request='Update', version=3, params=_params)
+        _params['application'] = application
+        _params['charm-url'] = charm_url
+        _params['constraints'] = constraints
+        _params['force-charm-url'] = force_charm_url
+        _params['force-series'] = force_series
+        _params['min-units'] = min_units
+        _params['settings'] = settings
+        _params['settings-yaml'] = settings_yaml
+        reply = await self.rpc(msg)
+        return reply
+
+
+class ApplicationRelationsWatcherFacade(Type):
+    name = 'ApplicationRelationsWatcher'
+    version = 1
+    schema =     {'definitions': {'ApplicationRelationsChange': {'additionalProperties': False,
+                                                    'properties': {'changed': {'items': {'$ref': '#/definitions/RelationChange'},
+                                                                               'type': 'array'},
+                                                                   'removed': {'items': {'type': 'integer'},
+                                                                               'type': 'array'}},
+                                                    'type': 'object'},
+                     'ApplicationRelationsWatchResult': {'additionalProperties': False,
+                                                         'properties': {'ApplicationRelationsWatcherId': {'type': 'string'},
+                                                                        'changes': {'$ref': '#/definitions/ApplicationRelationsChange'},
+                                                                        'error': {'$ref': '#/definitions/Error'}},
+                                                         'required': ['ApplicationRelationsWatcherId'],
+                                                         'type': 'object'},
+                     'Error': {'additionalProperties': False,
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
+                               'type': 'object'},
+                     'ErrorInfo': {'additionalProperties': False,
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
+                                   'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
+                     'RelationChange': {'additionalProperties': False,
+                                        'properties': {'changedunits': {'patternProperties': {'.*': {'$ref': '#/definitions/RelationUnitChange'}},
+                                                                        'type': 'object'},
+                                                       'departedunits': {'items': {'type': 'string'},
+                                                                         'type': 'array'},
+                                                       'id': {'type': 'integer'},
+                                                       'life': {'type': 'string'}},
+                                        'required': ['id', 'life'],
+                                        'type': 'object'},
+                     'RelationUnitChange': {'additionalProperties': False,
+                                            'properties': {'settings': {'patternProperties': {'.*': {'additionalProperties': True,
+                                                                                                     'type': 'object'}},
+                                                                        'type': 'object'}},
+                                            'type': 'object'}},
+     'properties': {'Next': {'properties': {'Result': {'$ref': '#/definitions/ApplicationRelationsWatchResult'}},
+                             'type': 'object'},
+                    'Stop': {'type': 'object'}},
+     'type': 'object'}
+    
+
+    @ReturnMapping(ApplicationRelationsWatchResult)
+    async def Next(self):
+        '''
+
+        Returns -> typing.Union[str, _ForwardRef('ApplicationRelationsChange'), _ForwardRef('Error')]
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='ApplicationRelationsWatcher', request='Next', version=1, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(None)
+    async def Stop(self):
+        '''
+
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Application', Request='Update', Version=1, Params=params)
-        params['ApplicationName'] = applicationname
-        params['CharmUrl'] = charmurl
-        params['Constraints'] = constraints
-        params['ForceCharmUrl'] = forcecharmurl
-        params['ForceSeries'] = forceseries
-        params['MinUnits'] = minunits
-        params['SettingsStrings'] = settingsstrings
-        params['SettingsYAML'] = settingsyaml
+        _params = dict()
+        msg = dict(type='ApplicationRelationsWatcher', request='Stop', version=1, params=_params)
+
         reply = await self.rpc(msg)
         return reply
 
@@ -7078,71 +7944,40 @@ class ApplicationScalerFacade(Type):
     name = 'ApplicationScaler'
     version = 1
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'StringsWatchResult': {'additionalProperties': False,
-                                            'properties': {'Changes': {'items': {'type': 'string'},
+                                            'properties': {'changes': {'items': {'type': 'string'},
                                                                        'type': 'array'},
-                                                           'Error': {'$ref': '#/definitions/Error'},
-                                                           'StringsWatcherId': {'type': 'string'}},
-                                            'required': ['StringsWatcherId',
-                                                         'Changes',
-                                                         'Error'],
-                                            'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                                           'error': {'$ref': '#/definitions/Error'},
+                                                           'watcher-id': {'type': 'string'}},
+                                            'required': ['watcher-id'],
+                                            'type': 'object'}},
      'properties': {'Rescale': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                'Result': {'$ref': '#/definitions/ErrorResults'}},
                                 'type': 'object'},
@@ -7154,13 +7989,13 @@ class ApplicationScalerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def Rescale(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='ApplicationScaler', Request='Rescale', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='ApplicationScaler', request='Rescale', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -7170,11 +8005,11 @@ class ApplicationScalerFacade(Type):
     async def Watch(self):
         '''
 
-        Returns -> typing.Union[typing.Sequence[str], _ForwardRef('Error')]
+        Returns -> typing.Union[typing.Sequence<+T_co>[str], _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='ApplicationScaler', Request='Watch', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='ApplicationScaler', request='Watch', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -7184,58 +8019,58 @@ class BackupsFacade(Type):
     name = 'Backups'
     version = 1
     schema =     {'definitions': {'BackupsCreateArgs': {'additionalProperties': False,
-                                           'properties': {'Notes': {'type': 'string'}},
-                                           'required': ['Notes'],
+                                           'properties': {'notes': {'type': 'string'}},
+                                           'required': ['notes'],
                                            'type': 'object'},
                      'BackupsInfoArgs': {'additionalProperties': False,
-                                         'properties': {'ID': {'type': 'string'}},
-                                         'required': ['ID'],
+                                         'properties': {'id': {'type': 'string'}},
+                                         'required': ['id'],
                                          'type': 'object'},
                      'BackupsListArgs': {'additionalProperties': False,
                                          'type': 'object'},
                      'BackupsListResult': {'additionalProperties': False,
-                                           'properties': {'List': {'items': {'$ref': '#/definitions/BackupsMetadataResult'},
+                                           'properties': {'list': {'items': {'$ref': '#/definitions/BackupsMetadataResult'},
                                                                    'type': 'array'}},
-                                           'required': ['List'],
+                                           'required': ['list'],
                                            'type': 'object'},
                      'BackupsMetadataResult': {'additionalProperties': False,
-                                               'properties': {'CACert': {'type': 'string'},
-                                                              'CAPrivateKey': {'type': 'string'},
-                                                              'Checksum': {'type': 'string'},
-                                                              'ChecksumFormat': {'type': 'string'},
-                                                              'Finished': {'format': 'date-time',
+                                               'properties': {'ca-cert': {'type': 'string'},
+                                                              'ca-private-key': {'type': 'string'},
+                                                              'checksum': {'type': 'string'},
+                                                              'checksum-format': {'type': 'string'},
+                                                              'finished': {'format': 'date-time',
                                                                            'type': 'string'},
-                                                              'Hostname': {'type': 'string'},
-                                                              'ID': {'type': 'string'},
-                                                              'Machine': {'type': 'string'},
-                                                              'Model': {'type': 'string'},
-                                                              'Notes': {'type': 'string'},
-                                                              'Series': {'type': 'string'},
-                                                              'Size': {'type': 'integer'},
-                                                              'Started': {'format': 'date-time',
+                                                              'hostname': {'type': 'string'},
+                                                              'id': {'type': 'string'},
+                                                              'machine': {'type': 'string'},
+                                                              'model': {'type': 'string'},
+                                                              'notes': {'type': 'string'},
+                                                              'series': {'type': 'string'},
+                                                              'size': {'type': 'integer'},
+                                                              'started': {'format': 'date-time',
                                                                           'type': 'string'},
-                                                              'Stored': {'format': 'date-time',
+                                                              'stored': {'format': 'date-time',
                                                                          'type': 'string'},
-                                                              'Version': {'$ref': '#/definitions/Number'}},
-                                               'required': ['ID',
-                                                            'Checksum',
-                                                            'ChecksumFormat',
-                                                            'Size',
-                                                            'Stored',
-                                                            'Started',
-                                                            'Finished',
-                                                            'Notes',
-                                                            'Model',
-                                                            'Machine',
-                                                            'Hostname',
-                                                            'Version',
-                                                            'Series',
-                                                            'CACert',
-                                                            'CAPrivateKey'],
+                                                              'version': {'$ref': '#/definitions/Number'}},
+                                               'required': ['id',
+                                                            'checksum',
+                                                            'checksum-format',
+                                                            'size',
+                                                            'stored',
+                                                            'started',
+                                                            'finished',
+                                                            'notes',
+                                                            'model',
+                                                            'machine',
+                                                            'hostname',
+                                                            'version',
+                                                            'series',
+                                                            'ca-cert',
+                                                            'ca-private-key'],
                                                'type': 'object'},
                      'BackupsRemoveArgs': {'additionalProperties': False,
-                                           'properties': {'ID': {'type': 'string'}},
-                                           'required': ['ID'],
+                                           'properties': {'id': {'type': 'string'}},
+                                           'required': ['id'],
                                            'type': 'object'},
                      'Number': {'additionalProperties': False,
                                 'properties': {'Build': {'type': 'integer'},
@@ -7250,8 +8085,8 @@ class BackupsFacade(Type):
                                              'Build'],
                                 'type': 'object'},
                      'RestoreArgs': {'additionalProperties': False,
-                                     'properties': {'BackupId': {'type': 'string'}},
-                                     'required': ['BackupId'],
+                                     'properties': {'backup-id': {'type': 'string'}},
+                                     'required': ['backup-id'],
                                      'type': 'object'}},
      'properties': {'Create': {'properties': {'Params': {'$ref': '#/definitions/BackupsCreateArgs'},
                                               'Result': {'$ref': '#/definitions/BackupsMetadataResult'}},
@@ -7278,9 +8113,9 @@ class BackupsFacade(Type):
         Returns -> typing.Union[str, int, _ForwardRef('Number')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Backups', Request='Create', Version=1, Params=params)
-        params['Notes'] = notes
+        _params = dict()
+        msg = dict(type='Backups', request='Create', version=1, params=_params)
+        _params['notes'] = notes
         reply = await self.rpc(msg)
         return reply
 
@@ -7293,8 +8128,8 @@ class BackupsFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Backups', Request='FinishRestore', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Backups', request='FinishRestore', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -7308,9 +8143,9 @@ class BackupsFacade(Type):
         Returns -> typing.Union[str, int, _ForwardRef('Number')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Backups', Request='Info', Version=1, Params=params)
-        params['ID'] = id_
+        _params = dict()
+        msg = dict(type='Backups', request='Info', version=1, params=_params)
+        _params['id'] = id_
         reply = await self.rpc(msg)
         return reply
 
@@ -7320,11 +8155,11 @@ class BackupsFacade(Type):
     async def List(self):
         '''
 
-        Returns -> typing.Sequence[~BackupsMetadataResult]
+        Returns -> typing.Sequence<+T_co>[~BackupsMetadataResult]<~BackupsMetadataResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Backups', Request='List', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Backups', request='List', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -7338,8 +8173,8 @@ class BackupsFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Backups', Request='PrepareRestore', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Backups', request='PrepareRestore', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -7353,24 +8188,24 @@ class BackupsFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Backups', Request='Remove', Version=1, Params=params)
-        params['ID'] = id_
+        _params = dict()
+        msg = dict(type='Backups', request='Remove', version=1, params=_params)
+        _params['id'] = id_
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(None)
-    async def Restore(self, backupid):
+    async def Restore(self, backup_id):
         '''
-        backupid : str
+        backup_id : str
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Backups', Request='Restore', Version=1, Params=params)
-        params['BackupId'] = backupid
+        _params = dict()
+        msg = dict(type='Backups', request='Restore', version=1, params=_params)
+        _params['backup-id'] = backup_id
         reply = await self.rpc(msg)
         return reply
 
@@ -7400,48 +8235,19 @@ class BlockFacade(Type):
                                            'required': ['type'],
                                            'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'}},
      'properties': {'List': {'properties': {'Result': {'$ref': '#/definitions/BlockResults'}},
                              'type': 'object'},
                     'SwitchBlockOff': {'properties': {'Params': {'$ref': '#/definitions/BlockSwitchParams'},
@@ -7457,11 +8263,11 @@ class BlockFacade(Type):
     async def List(self):
         '''
 
-        Returns -> typing.Sequence[~BlockResult]
+        Returns -> typing.Sequence<+T_co>[~BlockResult]<~BlockResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Block', Request='List', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='Block', request='List', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -7476,10 +8282,10 @@ class BlockFacade(Type):
         Returns -> Error
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Block', Request='SwitchBlockOff', Version=2, Params=params)
-        params['message'] = message
-        params['type'] = type_
+        _params = dict()
+        msg = dict(type='Block', request='SwitchBlockOff', version=2, params=_params)
+        _params['message'] = message
+        _params['type'] = type_
         reply = await self.rpc(msg)
         return reply
 
@@ -7493,10 +8299,56 @@ class BlockFacade(Type):
         Returns -> Error
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Block', Request='SwitchBlockOn', Version=2, Params=params)
-        params['message'] = message
-        params['type'] = type_
+        _params = dict()
+        msg = dict(type='Block', request='SwitchBlockOn', version=2, params=_params)
+        _params['message'] = message
+        _params['type'] = type_
+        reply = await self.rpc(msg)
+        return reply
+
+
+class BundleFacade(Type):
+    name = 'Bundle'
+    version = 1
+    schema =     {'definitions': {'BundleChange': {'additionalProperties': False,
+                                      'properties': {'args': {'items': {'additionalProperties': True,
+                                                                        'type': 'object'},
+                                                              'type': 'array'},
+                                                     'id': {'type': 'string'},
+                                                     'method': {'type': 'string'},
+                                                     'requires': {'items': {'type': 'string'},
+                                                                  'type': 'array'}},
+                                      'required': ['id',
+                                                   'method',
+                                                   'args',
+                                                   'requires'],
+                                      'type': 'object'},
+                     'BundleChangesParams': {'additionalProperties': False,
+                                             'properties': {'yaml': {'type': 'string'}},
+                                             'required': ['yaml'],
+                                             'type': 'object'},
+                     'BundleChangesResults': {'additionalProperties': False,
+                                              'properties': {'changes': {'items': {'$ref': '#/definitions/BundleChange'},
+                                                                         'type': 'array'},
+                                                             'errors': {'items': {'type': 'string'},
+                                                                        'type': 'array'}},
+                                              'type': 'object'}},
+     'properties': {'GetChanges': {'properties': {'Params': {'$ref': '#/definitions/BundleChangesParams'},
+                                                  'Result': {'$ref': '#/definitions/BundleChangesResults'}},
+                                   'type': 'object'}},
+     'type': 'object'}
+    
+
+    @ReturnMapping(BundleChangesResults)
+    async def GetChanges(self, yaml):
+        '''
+        yaml : str
+        Returns -> typing.Sequence<+T_co>[~BundleChange]<~BundleChange>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Bundle', request='GetChanges', version=1, params=_params)
+        _params['yaml'] = yaml
         reply = await self.rpc(msg)
         return reply
 
@@ -7505,48 +8357,19 @@ class CharmRevisionUpdaterFacade(Type):
     name = 'CharmRevisionUpdater'
     version = 2
     schema =     {'definitions': {'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'}},
      'properties': {'UpdateLatestRevisions': {'properties': {'Result': {'$ref': '#/definitions/ErrorResult'}},
                                               'type': 'object'}},
      'type': 'object'}
@@ -7559,8 +8382,8 @@ class CharmRevisionUpdaterFacade(Type):
         Returns -> Error
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='CharmRevisionUpdater', Request='UpdateLatestRevisions', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='CharmRevisionUpdater', request='UpdateLatestRevisions', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -7569,28 +8392,154 @@ class CharmRevisionUpdaterFacade(Type):
 class CharmsFacade(Type):
     name = 'Charms'
     version = 2
-    schema =     {'definitions': {'CharmInfo': {'additionalProperties': False,
-                                   'properties': {'CharmURL': {'type': 'string'}},
-                                   'required': ['CharmURL'],
+    schema =     {'definitions': {'CharmActionSpec': {'additionalProperties': False,
+                                         'properties': {'description': {'type': 'string'},
+                                                        'params': {'patternProperties': {'.*': {'additionalProperties': True,
+                                                                                                'type': 'object'}},
+                                                                   'type': 'object'}},
+                                         'required': ['description', 'params'],
+                                         'type': 'object'},
+                     'CharmActions': {'additionalProperties': False,
+                                      'properties': {'specs': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmActionSpec'}},
+                                                               'type': 'object'}},
+                                      'type': 'object'},
+                     'CharmInfo': {'additionalProperties': False,
+                                   'properties': {'actions': {'$ref': '#/definitions/CharmActions'},
+                                                  'config': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmOption'}},
+                                                             'type': 'object'},
+                                                  'meta': {'$ref': '#/definitions/CharmMeta'},
+                                                  'metrics': {'$ref': '#/definitions/CharmMetrics'},
+                                                  'revision': {'type': 'integer'},
+                                                  'url': {'type': 'string'}},
+                                   'required': ['revision', 'url', 'config'],
+                                   'type': 'object'},
+                     'CharmMeta': {'additionalProperties': False,
+                                   'properties': {'categories': {'items': {'type': 'string'},
+                                                                 'type': 'array'},
+                                                  'description': {'type': 'string'},
+                                                  'extra-bindings': {'patternProperties': {'.*': {'type': 'string'}},
+                                                                     'type': 'object'},
+                                                  'min-juju-version': {'type': 'string'},
+                                                  'name': {'type': 'string'},
+                                                  'payload-classes': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmPayloadClass'}},
+                                                                      'type': 'object'},
+                                                  'peers': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmRelation'}},
+                                                            'type': 'object'},
+                                                  'provides': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmRelation'}},
+                                                               'type': 'object'},
+                                                  'requires': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmRelation'}},
+                                                               'type': 'object'},
+                                                  'resources': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmResourceMeta'}},
+                                                                'type': 'object'},
+                                                  'series': {'items': {'type': 'string'},
+                                                             'type': 'array'},
+                                                  'storage': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmStorage'}},
+                                                              'type': 'object'},
+                                                  'subordinate': {'type': 'boolean'},
+                                                  'summary': {'type': 'string'},
+                                                  'tags': {'items': {'type': 'string'},
+                                                           'type': 'array'},
+                                                  'terms': {'items': {'type': 'string'},
+                                                            'type': 'array'}},
+                                   'required': ['name',
+                                                'summary',
+                                                'description',
+                                                'subordinate'],
+                                   'type': 'object'},
+                     'CharmMetric': {'additionalProperties': False,
+                                     'properties': {'description': {'type': 'string'},
+                                                    'type': {'type': 'string'}},
+                                     'required': ['type', 'description'],
+                                     'type': 'object'},
+                     'CharmMetrics': {'additionalProperties': False,
+                                      'properties': {'metrics': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmMetric'}},
+                                                                 'type': 'object'},
+                                                     'plan': {'$ref': '#/definitions/CharmPlan'}},
+                                      'required': ['metrics', 'plan'],
+                                      'type': 'object'},
+                     'CharmOption': {'additionalProperties': False,
+                                     'properties': {'default': {'additionalProperties': True,
+                                                                'type': 'object'},
+                                                    'description': {'type': 'string'},
+                                                    'type': {'type': 'string'}},
+                                     'required': ['type'],
+                                     'type': 'object'},
+                     'CharmPayloadClass': {'additionalProperties': False,
+                                           'properties': {'name': {'type': 'string'},
+                                                          'type': {'type': 'string'}},
+                                           'required': ['name', 'type'],
+                                           'type': 'object'},
+                     'CharmPlan': {'additionalProperties': False,
+                                   'properties': {'required': {'type': 'boolean'}},
+                                   'required': ['required'],
                                    'type': 'object'},
+                     'CharmRelation': {'additionalProperties': False,
+                                       'properties': {'interface': {'type': 'string'},
+                                                      'limit': {'type': 'integer'},
+                                                      'name': {'type': 'string'},
+                                                      'optional': {'type': 'boolean'},
+                                                      'role': {'type': 'string'},
+                                                      'scope': {'type': 'string'}},
+                                       'required': ['name',
+                                                    'role',
+                                                    'interface',
+                                                    'optional',
+                                                    'limit',
+                                                    'scope'],
+                                       'type': 'object'},
+                     'CharmResourceMeta': {'additionalProperties': False,
+                                           'properties': {'description': {'type': 'string'},
+                                                          'name': {'type': 'string'},
+                                                          'path': {'type': 'string'},
+                                                          'type': {'type': 'string'}},
+                                           'required': ['name',
+                                                        'type',
+                                                        'path',
+                                                        'description'],
+                                           'type': 'object'},
+                     'CharmStorage': {'additionalProperties': False,
+                                      'properties': {'count-max': {'type': 'integer'},
+                                                     'count-min': {'type': 'integer'},
+                                                     'description': {'type': 'string'},
+                                                     'location': {'type': 'string'},
+                                                     'minimum-size': {'type': 'integer'},
+                                                     'name': {'type': 'string'},
+                                                     'properties': {'items': {'type': 'string'},
+                                                                    'type': 'array'},
+                                                     'read-only': {'type': 'boolean'},
+                                                     'shared': {'type': 'boolean'},
+                                                     'type': {'type': 'string'}},
+                                      'required': ['name',
+                                                   'description',
+                                                   'type',
+                                                   'shared',
+                                                   'read-only',
+                                                   'count-min',
+                                                   'count-max',
+                                                   'minimum-size'],
+                                      'type': 'object'},
+                     'CharmURL': {'additionalProperties': False,
+                                  'properties': {'url': {'type': 'string'}},
+                                  'required': ['url'],
+                                  'type': 'object'},
                      'CharmsList': {'additionalProperties': False,
-                                    'properties': {'Names': {'items': {'type': 'string'},
+                                    'properties': {'names': {'items': {'type': 'string'},
                                                              'type': 'array'}},
-                                    'required': ['Names'],
+                                    'required': ['names'],
                                     'type': 'object'},
                      'CharmsListResult': {'additionalProperties': False,
-                                          'properties': {'CharmURLs': {'items': {'type': 'string'},
-                                                                       'type': 'array'}},
-                                          'required': ['CharmURLs'],
+                                          'properties': {'charm-urls': {'items': {'type': 'string'},
+                                                                        'type': 'array'}},
+                                          'required': ['charm-urls'],
                                           'type': 'object'},
                      'IsMeteredResult': {'additionalProperties': False,
-                                         'properties': {'Metered': {'type': 'boolean'}},
-                                         'required': ['Metered'],
+                                         'properties': {'metered': {'type': 'boolean'}},
+                                         'required': ['metered'],
                                          'type': 'object'}},
-     'properties': {'CharmInfo': {'properties': {'Params': {'$ref': '#/definitions/CharmInfo'},
+     'properties': {'CharmInfo': {'properties': {'Params': {'$ref': '#/definitions/CharmURL'},
                                                  'Result': {'$ref': '#/definitions/CharmInfo'}},
                                   'type': 'object'},
-                    'IsMetered': {'properties': {'Params': {'$ref': '#/definitions/CharmInfo'},
+                    'IsMetered': {'properties': {'Params': {'$ref': '#/definitions/CharmURL'},
                                                  'Result': {'$ref': '#/definitions/IsMeteredResult'}},
                                   'type': 'object'},
                     'List': {'properties': {'Params': {'$ref': '#/definitions/CharmsList'},
@@ -7600,30 +8549,30 @@ class CharmsFacade(Type):
     
 
     @ReturnMapping(CharmInfo)
-    async def CharmInfo(self, charmurl):
+    async def CharmInfo(self, url):
         '''
-        charmurl : str
-        Returns -> str
+        url : str
+        Returns -> typing.Union[_ForwardRef('CharmActions'), typing.Mapping<~KT, +VT_co>[str, ~CharmOption]<~CharmOption>, _ForwardRef('CharmMeta'), _ForwardRef('CharmMetrics'), int, str]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Charms', Request='CharmInfo', Version=2, Params=params)
-        params['CharmURL'] = charmurl
+        _params = dict()
+        msg = dict(type='Charms', request='CharmInfo', version=2, params=_params)
+        _params['url'] = url
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(IsMeteredResult)
-    async def IsMetered(self, charmurl):
+    async def IsMetered(self, url):
         '''
-        charmurl : str
+        url : str
         Returns -> bool
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Charms', Request='IsMetered', Version=2, Params=params)
-        params['CharmURL'] = charmurl
+        _params = dict()
+        msg = dict(type='Charms', request='IsMetered', version=2, params=_params)
+        _params['url'] = url
         reply = await self.rpc(msg)
         return reply
 
@@ -7632,13 +8581,13 @@ class CharmsFacade(Type):
     @ReturnMapping(CharmsListResult)
     async def List(self, names):
         '''
-        names : typing.Sequence[str]
-        Returns -> typing.Sequence[str]
+        names : typing.Sequence<+T_co>[str]
+        Returns -> typing.Sequence<+T_co>[str]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Charms', Request='List', Version=2, Params=params)
-        params['Names'] = names
+        _params = dict()
+        msg = dict(type='Charms', request='List', version=2, params=_params)
+        _params['names'] = names
         reply = await self.rpc(msg)
         return reply
 
@@ -7647,49 +8596,21 @@ class CleanerFacade(Type):
     name = 'Cleaner'
     version = 2
     schema =     {'definitions': {'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
-                                           'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
+                                           'type': 'object'}},
      'properties': {'Cleanup': {'type': 'object'},
                     'WatchCleanups': {'properties': {'Result': {'$ref': '#/definitions/NotifyWatchResult'}},
                                       'type': 'object'}},
@@ -7703,8 +8624,8 @@ class CleanerFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Cleaner', Request='Cleanup', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='Cleaner', request='Cleanup', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -7715,11 +8636,11 @@ class CleanerFacade(Type):
     async def WatchCleanups(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), str]
+        Returns -> typing.Union[str, _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Cleaner', Request='WatchCleanups', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='Cleaner', request='WatchCleanups', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -7729,108 +8650,109 @@ class ClientFacade(Type):
     name = 'Client'
     version = 1
     schema =     {'definitions': {'APIHostPortsResult': {'additionalProperties': False,
-                                            'properties': {'Servers': {'items': {'items': {'$ref': '#/definitions/HostPort'},
+                                            'properties': {'servers': {'items': {'items': {'$ref': '#/definitions/HostPort'},
                                                                                  'type': 'array'},
                                                                        'type': 'array'}},
-                                            'required': ['Servers'],
+                                            'required': ['servers'],
                                             'type': 'object'},
                      'AddCharm': {'additionalProperties': False,
-                                  'properties': {'Channel': {'type': 'string'},
-                                                 'URL': {'type': 'string'}},
-                                  'required': ['URL', 'Channel'],
+                                  'properties': {'channel': {'type': 'string'},
+                                                 'url': {'type': 'string'}},
+                                  'required': ['url', 'channel'],
                                   'type': 'object'},
                      'AddCharmWithAuthorization': {'additionalProperties': False,
-                                                   'properties': {'Channel': {'type': 'string'},
-                                                                  'CharmStoreMacaroon': {'$ref': '#/definitions/Macaroon'},
-                                                                  'URL': {'type': 'string'}},
-                                                   'required': ['URL',
-                                                                'Channel',
-                                                                'CharmStoreMacaroon'],
+                                                   'properties': {'channel': {'type': 'string'},
+                                                                  'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                                  'url': {'type': 'string'}},
+                                                   'required': ['url',
+                                                                'channel',
+                                                                'macaroon'],
                                                    'type': 'object'},
                      'AddMachineParams': {'additionalProperties': False,
-                                          'properties': {'Addrs': {'items': {'$ref': '#/definitions/Address'},
-                                                                   'type': 'array'},
-                                                         'Constraints': {'$ref': '#/definitions/Value'},
-                                                         'ContainerType': {'type': 'string'},
-                                                         'Disks': {'items': {'$ref': '#/definitions/Constraints'},
+                                          'properties': {'addresses': {'items': {'$ref': '#/definitions/Address'},
+                                                                       'type': 'array'},
+                                                         'constraints': {'$ref': '#/definitions/Value'},
+                                                         'container-type': {'type': 'string'},
+                                                         'disks': {'items': {'$ref': '#/definitions/Constraints'},
                                                                    'type': 'array'},
-                                                         'HardwareCharacteristics': {'$ref': '#/definitions/HardwareCharacteristics'},
-                                                         'InstanceId': {'type': 'string'},
-                                                         'Jobs': {'items': {'type': 'string'},
+                                                         'hardware-characteristics': {'$ref': '#/definitions/HardwareCharacteristics'},
+                                                         'instance-id': {'type': 'string'},
+                                                         'jobs': {'items': {'type': 'string'},
                                                                   'type': 'array'},
-                                                         'Nonce': {'type': 'string'},
-                                                         'ParentId': {'type': 'string'},
-                                                         'Placement': {'$ref': '#/definitions/Placement'},
-                                                         'Series': {'type': 'string'}},
-                                          'required': ['Series',
-                                                       'Constraints',
-                                                       'Jobs',
-                                                       'Disks',
-                                                       'Placement',
-                                                       'ParentId',
-                                                       'ContainerType',
-                                                       'InstanceId',
-                                                       'Nonce',
-                                                       'HardwareCharacteristics',
-                                                       'Addrs'],
+                                                         'nonce': {'type': 'string'},
+                                                         'parent-id': {'type': 'string'},
+                                                         'placement': {'$ref': '#/definitions/Placement'},
+                                                         'series': {'type': 'string'}},
+                                          'required': ['series',
+                                                       'constraints',
+                                                       'jobs',
+                                                       'parent-id',
+                                                       'container-type',
+                                                       'instance-id',
+                                                       'nonce',
+                                                       'hardware-characteristics',
+                                                       'addresses'],
                                           'type': 'object'},
                      'AddMachines': {'additionalProperties': False,
-                                     'properties': {'MachineParams': {'items': {'$ref': '#/definitions/AddMachineParams'},
-                                                                      'type': 'array'}},
-                                     'required': ['MachineParams'],
+                                     'properties': {'params': {'items': {'$ref': '#/definitions/AddMachineParams'},
+                                                               'type': 'array'}},
+                                     'required': ['params'],
                                      'type': 'object'},
                      'AddMachinesResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'Machine': {'type': 'string'}},
-                                           'required': ['Machine', 'Error'],
+                                           'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                          'machine': {'type': 'string'}},
+                                           'required': ['machine'],
                                            'type': 'object'},
                      'AddMachinesResults': {'additionalProperties': False,
-                                            'properties': {'Machines': {'items': {'$ref': '#/definitions/AddMachinesResult'},
+                                            'properties': {'machines': {'items': {'$ref': '#/definitions/AddMachinesResult'},
                                                                         'type': 'array'}},
-                                            'required': ['Machines'],
+                                            'required': ['machines'],
                                             'type': 'object'},
                      'Address': {'additionalProperties': False,
-                                 'properties': {'Scope': {'type': 'string'},
-                                                'SpaceName': {'type': 'string'},
-                                                'Type': {'type': 'string'},
-                                                'Value': {'type': 'string'}},
-                                 'required': ['Value', 'Type', 'Scope'],
+                                 'properties': {'scope': {'type': 'string'},
+                                                'space-name': {'type': 'string'},
+                                                'type': {'type': 'string'},
+                                                'value': {'type': 'string'}},
+                                 'required': ['value', 'type', 'scope'],
                                  'type': 'object'},
                      'AgentVersionResult': {'additionalProperties': False,
-                                            'properties': {'Version': {'$ref': '#/definitions/Number'}},
-                                            'required': ['Version'],
+                                            'properties': {'version': {'$ref': '#/definitions/Number'}},
+                                            'required': ['version'],
                                             'type': 'object'},
                      'AllWatcherId': {'additionalProperties': False,
-                                      'properties': {'AllWatcherId': {'type': 'string'}},
-                                      'required': ['AllWatcherId'],
+                                      'properties': {'watcher-id': {'type': 'string'}},
+                                      'required': ['watcher-id'],
                                       'type': 'object'},
                      'ApplicationStatus': {'additionalProperties': False,
-                                           'properties': {'CanUpgradeTo': {'type': 'string'},
-                                                          'Charm': {'type': 'string'},
-                                                          'Err': {'additionalProperties': True,
+                                           'properties': {'can-upgrade-to': {'type': 'string'},
+                                                          'charm': {'type': 'string'},
+                                                          'err': {'additionalProperties': True,
                                                                   'type': 'object'},
-                                                          'Exposed': {'type': 'boolean'},
-                                                          'Life': {'type': 'string'},
-                                                          'MeterStatuses': {'patternProperties': {'.*': {'$ref': '#/definitions/MeterStatus'}},
-                                                                            'type': 'object'},
-                                                          'Relations': {'patternProperties': {'.*': {'items': {'type': 'string'},
+                                                          'exposed': {'type': 'boolean'},
+                                                          'life': {'type': 'string'},
+                                                          'meter-statuses': {'patternProperties': {'.*': {'$ref': '#/definitions/MeterStatus'}},
+                                                                             'type': 'object'},
+                                                          'relations': {'patternProperties': {'.*': {'items': {'type': 'string'},
                                                                                                      'type': 'array'}},
                                                                         'type': 'object'},
-                                                          'Status': {'$ref': '#/definitions/DetailedStatus'},
-                                                          'SubordinateTo': {'items': {'type': 'string'},
-                                                                            'type': 'array'},
-                                                          'Units': {'patternProperties': {'.*': {'$ref': '#/definitions/UnitStatus'}},
-                                                                    'type': 'object'}},
-                                           'required': ['Err',
-                                                        'Charm',
-                                                        'Exposed',
-                                                        'Life',
-                                                        'Relations',
-                                                        'CanUpgradeTo',
-                                                        'SubordinateTo',
-                                                        'Units',
-                                                        'MeterStatuses',
-                                                        'Status'],
+                                                          'series': {'type': 'string'},
+                                                          'status': {'$ref': '#/definitions/DetailedStatus'},
+                                                          'subordinate-to': {'items': {'type': 'string'},
+                                                                             'type': 'array'},
+                                                          'units': {'patternProperties': {'.*': {'$ref': '#/definitions/UnitStatus'}},
+                                                                    'type': 'object'},
+                                                          'workload-version': {'type': 'string'}},
+                                           'required': ['charm',
+                                                        'series',
+                                                        'exposed',
+                                                        'life',
+                                                        'relations',
+                                                        'can-upgrade-to',
+                                                        'subordinate-to',
+                                                        'units',
+                                                        'meter-statuses',
+                                                        'status',
+                                                        'workload-version'],
                                            'type': 'object'},
                      'Binary': {'additionalProperties': False,
                                 'properties': {'Arch': {'type': 'string'},
@@ -7838,23 +8760,35 @@ class ClientFacade(Type):
                                                'Series': {'type': 'string'}},
                                 'required': ['Number', 'Series', 'Arch'],
                                 'type': 'object'},
-                     'BundleChangesChange': {'additionalProperties': False,
-                                             'properties': {'args': {'items': {'additionalProperties': True,
-                                                                               'type': 'object'},
-                                                                     'type': 'array'},
-                                                            'id': {'type': 'string'},
-                                                            'method': {'type': 'string'},
-                                                            'requires': {'items': {'type': 'string'},
-                                                                         'type': 'array'}},
-                                             'required': ['id',
-                                                          'method',
-                                                          'args',
-                                                          'requires'],
+                     'BundleChange': {'additionalProperties': False,
+                                      'properties': {'args': {'items': {'additionalProperties': True,
+                                                                        'type': 'object'},
+                                                              'type': 'array'},
+                                                     'id': {'type': 'string'},
+                                                     'method': {'type': 'string'},
+                                                     'requires': {'items': {'type': 'string'},
+                                                                  'type': 'array'}},
+                                      'required': ['id',
+                                                   'method',
+                                                   'args',
+                                                   'requires'],
+                                      'type': 'object'},
+                     'BundleChangesParams': {'additionalProperties': False,
+                                             'properties': {'yaml': {'type': 'string'}},
+                                             'required': ['yaml'],
                                              'type': 'object'},
-                     'CharmInfo': {'additionalProperties': False,
-                                   'properties': {'CharmURL': {'type': 'string'}},
-                                   'required': ['CharmURL'],
-                                   'type': 'object'},
+                     'BundleChangesResults': {'additionalProperties': False,
+                                              'properties': {'changes': {'items': {'$ref': '#/definitions/BundleChange'},
+                                                                         'type': 'array'},
+                                                             'errors': {'items': {'type': 'string'},
+                                                                        'type': 'array'}},
+                                              'type': 'object'},
+                     'ConfigValue': {'additionalProperties': False,
+                                     'properties': {'source': {'type': 'string'},
+                                                    'value': {'additionalProperties': True,
+                                                              'type': 'object'}},
+                                     'required': ['value', 'source'],
+                                     'type': 'object'},
                      'Constraints': {'additionalProperties': False,
                                      'properties': {'Count': {'type': 'integer'},
                                                     'Pool': {'type': 'string'},
@@ -7862,247 +8796,257 @@ class ClientFacade(Type):
                                      'required': ['Pool', 'Size', 'Count'],
                                      'type': 'object'},
                      'DestroyMachines': {'additionalProperties': False,
-                                         'properties': {'Force': {'type': 'boolean'},
-                                                        'MachineNames': {'items': {'type': 'string'},
-                                                                         'type': 'array'}},
-                                         'required': ['MachineNames', 'Force'],
+                                         'properties': {'force': {'type': 'boolean'},
+                                                        'machine-names': {'items': {'type': 'string'},
+                                                                          'type': 'array'}},
+                                         'required': ['machine-names', 'force'],
                                          'type': 'object'},
                      'DetailedStatus': {'additionalProperties': False,
-                                        'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True,
+                                        'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                              'type': 'object'}},
                                                                 'type': 'object'},
-                                                       'Err': {'additionalProperties': True,
+                                                       'err': {'additionalProperties': True,
                                                                'type': 'object'},
-                                                       'Info': {'type': 'string'},
-                                                       'Kind': {'type': 'string'},
-                                                       'Life': {'type': 'string'},
-                                                       'Since': {'format': 'date-time',
+                                                       'info': {'type': 'string'},
+                                                       'kind': {'type': 'string'},
+                                                       'life': {'type': 'string'},
+                                                       'since': {'format': 'date-time',
                                                                  'type': 'string'},
-                                                       'Status': {'type': 'string'},
-                                                       'Version': {'type': 'string'}},
-                                        'required': ['Status',
-                                                     'Info',
-                                                     'Data',
-                                                     'Since',
-                                                     'Kind',
-                                                     'Version',
-                                                     'Life',
-                                                     'Err'],
+                                                       'status': {'type': 'string'},
+                                                       'version': {'type': 'string'}},
+                                        'required': ['status',
+                                                     'info',
+                                                     'data',
+                                                     'since',
+                                                     'kind',
+                                                     'version',
+                                                     'life'],
                                         'type': 'object'},
                      'EndpointStatus': {'additionalProperties': False,
-                                        'properties': {'ApplicationName': {'type': 'string'},
-                                                       'Name': {'type': 'string'},
-                                                       'Role': {'type': 'string'},
-                                                       'Subordinate': {'type': 'boolean'}},
-                                        'required': ['ApplicationName',
-                                                     'Name',
-                                                     'Role',
-                                                     'Subordinate'],
+                                        'properties': {'application': {'type': 'string'},
+                                                       'name': {'type': 'string'},
+                                                       'role': {'type': 'string'},
+                                                       'subordinate': {'type': 'boolean'}},
+                                        'required': ['application',
+                                                     'name',
+                                                     'role',
+                                                     'subordinate'],
                                         'type': 'object'},
                      'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'EntityStatus': {'additionalProperties': False,
-                                      'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True,
+                                      'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                            'type': 'object'}},
                                                               'type': 'object'},
-                                                     'Info': {'type': 'string'},
-                                                     'Since': {'format': 'date-time',
+                                                     'info': {'type': 'string'},
+                                                     'since': {'format': 'date-time',
                                                                'type': 'string'},
-                                                     'Status': {'type': 'string'}},
-                                      'required': ['Status',
-                                                   'Info',
-                                                   'Data',
-                                                   'Since'],
+                                                     'status': {'type': 'string'}},
+                                      'required': ['status', 'info', 'since'],
                                       'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'FindToolsParams': {'additionalProperties': False,
-                                         'properties': {'Arch': {'type': 'string'},
-                                                        'MajorVersion': {'type': 'integer'},
-                                                        'MinorVersion': {'type': 'integer'},
-                                                        'Number': {'$ref': '#/definitions/Number'},
-                                                        'Series': {'type': 'string'}},
-                                         'required': ['Number',
-                                                      'MajorVersion',
-                                                      'MinorVersion',
-                                                      'Arch',
-                                                      'Series'],
+                                         'properties': {'arch': {'type': 'string'},
+                                                        'major': {'type': 'integer'},
+                                                        'minor': {'type': 'integer'},
+                                                        'number': {'$ref': '#/definitions/Number'},
+                                                        'series': {'type': 'string'}},
+                                         'required': ['number',
+                                                      'major',
+                                                      'minor',
+                                                      'arch',
+                                                      'series'],
                                          'type': 'object'},
                      'FindToolsResult': {'additionalProperties': False,
-                                         'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                        'List': {'items': {'$ref': '#/definitions/Tools'},
+                                         'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                        'list': {'items': {'$ref': '#/definitions/Tools'},
                                                                  'type': 'array'}},
-                                         'required': ['List', 'Error'],
+                                         'required': ['list'],
                                          'type': 'object'},
                      'FullStatus': {'additionalProperties': False,
-                                    'properties': {'Applications': {'patternProperties': {'.*': {'$ref': '#/definitions/ApplicationStatus'}},
+                                    'properties': {'applications': {'patternProperties': {'.*': {'$ref': '#/definitions/ApplicationStatus'}},
                                                                     'type': 'object'},
-                                                   'AvailableVersion': {'type': 'string'},
-                                                   'Machines': {'patternProperties': {'.*': {'$ref': '#/definitions/MachineStatus'}},
+                                                   'machines': {'patternProperties': {'.*': {'$ref': '#/definitions/MachineStatus'}},
                                                                 'type': 'object'},
-                                                   'ModelName': {'type': 'string'},
-                                                   'Relations': {'items': {'$ref': '#/definitions/RelationStatus'},
-                                                                 'type': 'array'}},
-                                    'required': ['ModelName',
-                                                 'AvailableVersion',
-                                                 'Machines',
-                                                 'Applications',
-                                                 'Relations'],
+                                                   'model': {'$ref': '#/definitions/ModelStatusInfo'},
+                                                   'relations': {'items': {'$ref': '#/definitions/RelationStatus'},
+                                                                 'type': 'array'},
+                                                   'remote-applications': {'patternProperties': {'.*': {'$ref': '#/definitions/RemoteApplicationStatus'}},
+                                                                           'type': 'object'}},
+                                    'required': ['model',
+                                                 'machines',
+                                                 'applications',
+                                                 'remote-applications',
+                                                 'relations'],
                                     'type': 'object'},
-                     'GetBundleChangesParams': {'additionalProperties': False,
-                                                'properties': {'yaml': {'type': 'string'}},
-                                                'required': ['yaml'],
-                                                'type': 'object'},
-                     'GetBundleChangesResults': {'additionalProperties': False,
-                                                 'properties': {'changes': {'items': {'$ref': '#/definitions/BundleChangesChange'},
-                                                                            'type': 'array'},
-                                                                'errors': {'items': {'type': 'string'},
-                                                                           'type': 'array'}},
-                                                 'type': 'object'},
                      'GetConstraintsResults': {'additionalProperties': False,
-                                               'properties': {'Constraints': {'$ref': '#/definitions/Value'}},
-                                               'required': ['Constraints'],
+                                               'properties': {'constraints': {'$ref': '#/definitions/Value'}},
+                                               'required': ['constraints'],
                                                'type': 'object'},
                      'HardwareCharacteristics': {'additionalProperties': False,
-                                                 'properties': {'Arch': {'type': 'string'},
-                                                                'AvailabilityZone': {'type': 'string'},
-                                                                'CpuCores': {'type': 'integer'},
-                                                                'CpuPower': {'type': 'integer'},
-                                                                'Mem': {'type': 'integer'},
-                                                                'RootDisk': {'type': 'integer'},
-                                                                'Tags': {'items': {'type': 'string'},
+                                                 'properties': {'arch': {'type': 'string'},
+                                                                'availability-zone': {'type': 'string'},
+                                                                'cpu-cores': {'type': 'integer'},
+                                                                'cpu-power': {'type': 'integer'},
+                                                                'mem': {'type': 'integer'},
+                                                                'root-disk': {'type': 'integer'},
+                                                                'tags': {'items': {'type': 'string'},
                                                                          'type': 'array'}},
                                                  'type': 'object'},
                      'History': {'additionalProperties': False,
-                                 'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                'Statuses': {'items': {'$ref': '#/definitions/DetailedStatus'},
+                                 'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                'statuses': {'items': {'$ref': '#/definitions/DetailedStatus'},
                                                              'type': 'array'}},
-                                 'required': ['Statuses'],
+                                 'required': ['statuses'],
                                  'type': 'object'},
                      'HostPort': {'additionalProperties': False,
                                   'properties': {'Address': {'$ref': '#/definitions/Address'},
-                                                 'Port': {'type': 'integer'}},
-                                  'required': ['Address', 'Port'],
-                                  'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
+                                                 'port': {'type': 'integer'}},
+                                  'required': ['Address', 'port'],
                                   'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
+                     'MachineHardware': {'additionalProperties': False,
+                                         'properties': {'arch': {'type': 'string'},
+                                                        'availability-zone': {'type': 'string'},
+                                                        'cores': {'type': 'integer'},
+                                                        'cpu-power': {'type': 'integer'},
+                                                        'mem': {'type': 'integer'},
+                                                        'root-disk': {'type': 'integer'},
+                                                        'tags': {'items': {'type': 'string'},
+                                                                 'type': 'array'}},
+                                         'type': 'object'},
                      'MachineStatus': {'additionalProperties': False,
-                                       'properties': {'AgentStatus': {'$ref': '#/definitions/DetailedStatus'},
-                                                      'Containers': {'patternProperties': {'.*': {'$ref': '#/definitions/MachineStatus'}},
+                                       'properties': {'agent-status': {'$ref': '#/definitions/DetailedStatus'},
+                                                      'containers': {'patternProperties': {'.*': {'$ref': '#/definitions/MachineStatus'}},
                                                                      'type': 'object'},
-                                                      'DNSName': {'type': 'string'},
-                                                      'Hardware': {'type': 'string'},
-                                                      'HasVote': {'type': 'boolean'},
-                                                      'Id': {'type': 'string'},
-                                                      'InstanceId': {'type': 'string'},
-                                                      'InstanceStatus': {'$ref': '#/definitions/DetailedStatus'},
-                                                      'Jobs': {'items': {'type': 'string'},
+                                                      'dns-name': {'type': 'string'},
+                                                      'hardware': {'type': 'string'},
+                                                      'has-vote': {'type': 'boolean'},
+                                                      'id': {'type': 'string'},
+                                                      'instance-id': {'type': 'string'},
+                                                      'instance-status': {'$ref': '#/definitions/DetailedStatus'},
+                                                      'ip-addresses': {'items': {'type': 'string'},
+                                                                       'type': 'array'},
+                                                      'jobs': {'items': {'type': 'string'},
                                                                'type': 'array'},
-                                                      'Series': {'type': 'string'},
-                                                      'WantsVote': {'type': 'boolean'}},
-                                       'required': ['AgentStatus',
-                                                    'InstanceStatus',
-                                                    'DNSName',
-                                                    'InstanceId',
-                                                    'Series',
-                                                    'Id',
-                                                    'Containers',
-                                                    'Hardware',
-                                                    'Jobs',
-                                                    'HasVote',
-                                                    'WantsVote'],
+                                                      'series': {'type': 'string'},
+                                                      'wants-vote': {'type': 'boolean'}},
+                                       'required': ['agent-status',
+                                                    'instance-status',
+                                                    'dns-name',
+                                                    'ip-addresses',
+                                                    'instance-id',
+                                                    'series',
+                                                    'id',
+                                                    'containers',
+                                                    'hardware',
+                                                    'jobs',
+                                                    'has-vote',
+                                                    'wants-vote'],
                                        'type': 'object'},
                      'MeterStatus': {'additionalProperties': False,
-                                     'properties': {'Color': {'type': 'string'},
-                                                    'Message': {'type': 'string'}},
-                                     'required': ['Color', 'Message'],
+                                     'properties': {'color': {'type': 'string'},
+                                                    'message': {'type': 'string'}},
+                                     'required': ['color', 'message'],
                                      'type': 'object'},
                      'ModelConfigResults': {'additionalProperties': False,
-                                            'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True,
-                                                                                                   'type': 'object'}},
+                                            'properties': {'config': {'patternProperties': {'.*': {'$ref': '#/definitions/ConfigValue'}},
                                                                       'type': 'object'}},
-                                            'required': ['Config'],
+                                            'required': ['config'],
                                             'type': 'object'},
                      'ModelInfo': {'additionalProperties': False,
-                                   'properties': {'Cloud': {'type': 'string'},
-                                                  'DefaultSeries': {'type': 'string'},
-                                                  'Life': {'type': 'string'},
-                                                  'Name': {'type': 'string'},
-                                                  'OwnerTag': {'type': 'string'},
-                                                  'ProviderType': {'type': 'string'},
-                                                  'ServerUUID': {'type': 'string'},
-                                                  'Status': {'$ref': '#/definitions/EntityStatus'},
-                                                  'UUID': {'type': 'string'},
-                                                  'Users': {'items': {'$ref': '#/definitions/ModelUserInfo'},
-                                                            'type': 'array'}},
-                                   'required': ['Name',
-                                                'UUID',
-                                                'ServerUUID',
-                                                'ProviderType',
-                                                'DefaultSeries',
-                                                'Cloud',
-                                                'OwnerTag',
-                                                'Life',
-                                                'Status',
-                                                'Users'],
+                                   'properties': {'cloud-credential-tag': {'type': 'string'},
+                                                  'cloud-region': {'type': 'string'},
+                                                  'cloud-tag': {'type': 'string'},
+                                                  'controller-uuid': {'type': 'string'},
+                                                  'default-series': {'type': 'string'},
+                                                  'life': {'type': 'string'},
+                                                  'machines': {'items': {'$ref': '#/definitions/ModelMachineInfo'},
+                                                               'type': 'array'},
+                                                  'name': {'type': 'string'},
+                                                  'owner-tag': {'type': 'string'},
+                                                  'provider-type': {'type': 'string'},
+                                                  'status': {'$ref': '#/definitions/EntityStatus'},
+                                                  'users': {'items': {'$ref': '#/definitions/ModelUserInfo'},
+                                                            'type': 'array'},
+                                                  'uuid': {'type': 'string'}},
+                                   'required': ['name',
+                                                'uuid',
+                                                'controller-uuid',
+                                                'provider-type',
+                                                'default-series',
+                                                'cloud-tag',
+                                                'owner-tag',
+                                                'life',
+                                                'status',
+                                                'users',
+                                                'machines'],
                                    'type': 'object'},
+                     'ModelMachineInfo': {'additionalProperties': False,
+                                          'properties': {'hardware': {'$ref': '#/definitions/MachineHardware'},
+                                                         'has-vote': {'type': 'boolean'},
+                                                         'id': {'type': 'string'},
+                                                         'instance-id': {'type': 'string'},
+                                                         'status': {'type': 'string'},
+                                                         'wants-vote': {'type': 'boolean'}},
+                                          'required': ['id'],
+                                          'type': 'object'},
                      'ModelSet': {'additionalProperties': False,
-                                  'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                  'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                          'type': 'object'}},
                                                             'type': 'object'}},
-                                  'required': ['Config'],
+                                  'required': ['config'],
                                   'type': 'object'},
+                     'ModelStatusInfo': {'additionalProperties': False,
+                                         'properties': {'available-version': {'type': 'string'},
+                                                        'cloud-tag': {'type': 'string'},
+                                                        'migration': {'type': 'string'},
+                                                        'name': {'type': 'string'},
+                                                        'region': {'type': 'string'},
+                                                        'version': {'type': 'string'}},
+                                         'required': ['name',
+                                                      'cloud-tag',
+                                                      'version',
+                                                      'available-version'],
+                                         'type': 'object'},
                      'ModelUnset': {'additionalProperties': False,
-                                    'properties': {'Keys': {'items': {'type': 'string'},
+                                    'properties': {'keys': {'items': {'type': 'string'},
                                                             'type': 'array'}},
-                                    'required': ['Keys'],
+                                    'required': ['keys'],
                                     'type': 'object'},
                      'ModelUserInfo': {'additionalProperties': False,
                                        'properties': {'access': {'type': 'string'},
-                                                      'displayname': {'type': 'string'},
-                                                      'lastconnection': {'format': 'date-time',
-                                                                         'type': 'string'},
+                                                      'display-name': {'type': 'string'},
+                                                      'last-connection': {'format': 'date-time',
+                                                                          'type': 'string'},
                                                       'user': {'type': 'string'}},
                                        'required': ['user',
-                                                    'displayname',
-                                                    'lastconnection',
+                                                    'display-name',
+                                                    'last-connection',
                                                     'access'],
                                        'type': 'object'},
                      'ModelUserInfoResult': {'additionalProperties': False,
@@ -8127,118 +9071,148 @@ class ClientFacade(Type):
                                              'Build'],
                                 'type': 'object'},
                      'Placement': {'additionalProperties': False,
-                                   'properties': {'Directive': {'type': 'string'},
-                                                  'Scope': {'type': 'string'}},
-                                   'required': ['Scope', 'Directive'],
+                                   'properties': {'directive': {'type': 'string'},
+                                                  'scope': {'type': 'string'}},
+                                   'required': ['scope', 'directive'],
                                    'type': 'object'},
                      'PrivateAddress': {'additionalProperties': False,
-                                        'properties': {'Target': {'type': 'string'}},
-                                        'required': ['Target'],
+                                        'properties': {'target': {'type': 'string'}},
+                                        'required': ['target'],
                                         'type': 'object'},
                      'PrivateAddressResults': {'additionalProperties': False,
-                                               'properties': {'PrivateAddress': {'type': 'string'}},
-                                               'required': ['PrivateAddress'],
+                                               'properties': {'private-address': {'type': 'string'}},
+                                               'required': ['private-address'],
                                                'type': 'object'},
                      'ProvisioningScriptParams': {'additionalProperties': False,
-                                                  'properties': {'DataDir': {'type': 'string'},
-                                                                 'DisablePackageCommands': {'type': 'boolean'},
-                                                                 'MachineId': {'type': 'string'},
-                                                                 'Nonce': {'type': 'string'}},
-                                                  'required': ['MachineId',
-                                                               'Nonce',
-                                                               'DataDir',
-                                                               'DisablePackageCommands'],
+                                                  'properties': {'data-dir': {'type': 'string'},
+                                                                 'disable-package-commands': {'type': 'boolean'},
+                                                                 'machine-id': {'type': 'string'},
+                                                                 'nonce': {'type': 'string'}},
+                                                  'required': ['machine-id',
+                                                               'nonce',
+                                                               'data-dir',
+                                                               'disable-package-commands'],
                                                   'type': 'object'},
                      'ProvisioningScriptResult': {'additionalProperties': False,
-                                                  'properties': {'Script': {'type': 'string'}},
-                                                  'required': ['Script'],
+                                                  'properties': {'script': {'type': 'string'}},
+                                                  'required': ['script'],
                                                   'type': 'object'},
                      'PublicAddress': {'additionalProperties': False,
-                                       'properties': {'Target': {'type': 'string'}},
-                                       'required': ['Target'],
+                                       'properties': {'target': {'type': 'string'}},
+                                       'required': ['target'],
                                        'type': 'object'},
                      'PublicAddressResults': {'additionalProperties': False,
-                                              'properties': {'PublicAddress': {'type': 'string'}},
-                                              'required': ['PublicAddress'],
+                                              'properties': {'public-address': {'type': 'string'}},
+                                              'required': ['public-address'],
                                               'type': 'object'},
                      'RelationStatus': {'additionalProperties': False,
-                                        'properties': {'Endpoints': {'items': {'$ref': '#/definitions/EndpointStatus'},
+                                        'properties': {'endpoints': {'items': {'$ref': '#/definitions/EndpointStatus'},
                                                                      'type': 'array'},
-                                                       'Id': {'type': 'integer'},
-                                                       'Interface': {'type': 'string'},
-                                                       'Key': {'type': 'string'},
-                                                       'Scope': {'type': 'string'}},
-                                        'required': ['Id',
-                                                     'Key',
-                                                     'Interface',
-                                                     'Scope',
-                                                     'Endpoints'],
+                                                       'id': {'type': 'integer'},
+                                                       'interface': {'type': 'string'},
+                                                       'key': {'type': 'string'},
+                                                       'scope': {'type': 'string'}},
+                                        'required': ['id',
+                                                     'key',
+                                                     'interface',
+                                                     'scope',
+                                                     'endpoints'],
+                                        'type': 'object'},
+                     'RemoteApplicationStatus': {'additionalProperties': False,
+                                                 'properties': {'application-name': {'type': 'string'},
+                                                                'application-url': {'type': 'string'},
+                                                                'endpoints': {'items': {'$ref': '#/definitions/RemoteEndpoint'},
+                                                                              'type': 'array'},
+                                                                'err': {'additionalProperties': True,
+                                                                        'type': 'object'},
+                                                                'life': {'type': 'string'},
+                                                                'relations': {'patternProperties': {'.*': {'items': {'type': 'string'},
+                                                                                                           'type': 'array'}},
+                                                                              'type': 'object'},
+                                                                'status': {'$ref': '#/definitions/DetailedStatus'}},
+                                                 'required': ['application-url',
+                                                              'application-name',
+                                                              'endpoints',
+                                                              'life',
+                                                              'relations',
+                                                              'status'],
+                                                 'type': 'object'},
+                     'RemoteEndpoint': {'additionalProperties': False,
+                                        'properties': {'interface': {'type': 'string'},
+                                                       'limit': {'type': 'integer'},
+                                                       'name': {'type': 'string'},
+                                                       'role': {'type': 'string'},
+                                                       'scope': {'type': 'string'}},
+                                        'required': ['name',
+                                                     'role',
+                                                     'interface',
+                                                     'limit',
+                                                     'scope'],
                                         'type': 'object'},
                      'ResolveCharmResult': {'additionalProperties': False,
-                                            'properties': {'Error': {'type': 'string'},
-                                                           'URL': {'$ref': '#/definitions/URL'}},
+                                            'properties': {'error': {'type': 'string'},
+                                                           'url': {'type': 'string'}},
                                             'type': 'object'},
                      'ResolveCharmResults': {'additionalProperties': False,
-                                             'properties': {'URLs': {'items': {'$ref': '#/definitions/ResolveCharmResult'},
+                                             'properties': {'urls': {'items': {'$ref': '#/definitions/ResolveCharmResult'},
                                                                      'type': 'array'}},
-                                             'required': ['URLs'],
+                                             'required': ['urls'],
                                              'type': 'object'},
                      'ResolveCharms': {'additionalProperties': False,
-                                       'properties': {'References': {'items': {'$ref': '#/definitions/URL'},
+                                       'properties': {'references': {'items': {'type': 'string'},
                                                                      'type': 'array'}},
-                                       'required': ['References'],
+                                       'required': ['references'],
                                        'type': 'object'},
                      'Resolved': {'additionalProperties': False,
-                                  'properties': {'Retry': {'type': 'boolean'},
-                                                 'UnitName': {'type': 'string'}},
-                                  'required': ['UnitName', 'Retry'],
+                                  'properties': {'retry': {'type': 'boolean'},
+                                                 'unit-name': {'type': 'string'}},
+                                  'required': ['unit-name', 'retry'],
                                   'type': 'object'},
                      'SetConstraints': {'additionalProperties': False,
-                                        'properties': {'ApplicationName': {'type': 'string'},
-                                                       'Constraints': {'$ref': '#/definitions/Value'}},
-                                        'required': ['ApplicationName',
-                                                     'Constraints'],
+                                        'properties': {'application': {'type': 'string'},
+                                                       'constraints': {'$ref': '#/definitions/Value'}},
+                                        'required': ['application', 'constraints'],
                                         'type': 'object'},
                      'SetModelAgentVersion': {'additionalProperties': False,
-                                              'properties': {'Version': {'$ref': '#/definitions/Number'}},
-                                              'required': ['Version'],
+                                              'properties': {'version': {'$ref': '#/definitions/Number'}},
+                                              'required': ['version'],
                                               'type': 'object'},
                      'StatusHistoryFilter': {'additionalProperties': False,
-                                             'properties': {'Date': {'format': 'date-time',
+                                             'properties': {'date': {'format': 'date-time',
                                                                      'type': 'string'},
-                                                            'Delta': {'type': 'integer'},
-                                                            'Size': {'type': 'integer'}},
-                                             'required': ['Size', 'Date', 'Delta'],
+                                                            'delta': {'type': 'integer'},
+                                                            'size': {'type': 'integer'}},
+                                             'required': ['size', 'date', 'delta'],
                                              'type': 'object'},
                      'StatusHistoryRequest': {'additionalProperties': False,
-                                              'properties': {'Filter': {'$ref': '#/definitions/StatusHistoryFilter'},
-                                                             'HistoryKind': {'type': 'string'},
-                                                             'Size': {'type': 'integer'},
-                                                             'Tag': {'type': 'string'}},
-                                              'required': ['HistoryKind',
-                                                           'Size',
-                                                           'Filter',
-                                                           'Tag'],
+                                              'properties': {'filter': {'$ref': '#/definitions/StatusHistoryFilter'},
+                                                             'historyKind': {'type': 'string'},
+                                                             'size': {'type': 'integer'},
+                                                             'tag': {'type': 'string'}},
+                                              'required': ['historyKind',
+                                                           'size',
+                                                           'filter',
+                                                           'tag'],
                                               'type': 'object'},
                      'StatusHistoryRequests': {'additionalProperties': False,
-                                               'properties': {'Requests': {'items': {'$ref': '#/definitions/StatusHistoryRequest'},
+                                               'properties': {'requests': {'items': {'$ref': '#/definitions/StatusHistoryRequest'},
                                                                            'type': 'array'}},
-                                               'required': ['Requests'],
+                                               'required': ['requests'],
                                                'type': 'object'},
                      'StatusHistoryResult': {'additionalProperties': False,
-                                             'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                            'History': {'$ref': '#/definitions/History'}},
-                                             'required': ['History'],
+                                             'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                            'history': {'$ref': '#/definitions/History'}},
+                                             'required': ['history'],
                                              'type': 'object'},
                      'StatusHistoryResults': {'additionalProperties': False,
-                                              'properties': {'Results': {'items': {'$ref': '#/definitions/StatusHistoryResult'},
+                                              'properties': {'results': {'items': {'$ref': '#/definitions/StatusHistoryResult'},
                                                                          'type': 'array'}},
-                                              'required': ['Results'],
+                                              'required': ['results'],
                                               'type': 'object'},
                      'StatusParams': {'additionalProperties': False,
-                                      'properties': {'Patterns': {'items': {'type': 'string'},
+                                      'properties': {'patterns': {'items': {'type': 'string'},
                                                                   'type': 'array'}},
-                                      'required': ['Patterns'],
+                                      'required': ['patterns'],
                                       'type': 'object'},
                      'Tools': {'additionalProperties': False,
                                'properties': {'sha256': {'type': 'string'},
@@ -8247,42 +9221,31 @@ class ClientFacade(Type):
                                               'version': {'$ref': '#/definitions/Binary'}},
                                'required': ['version', 'url', 'size'],
                                'type': 'object'},
-                     'URL': {'additionalProperties': False,
-                             'properties': {'Channel': {'type': 'string'},
-                                            'Name': {'type': 'string'},
-                                            'Revision': {'type': 'integer'},
-                                            'Schema': {'type': 'string'},
-                                            'Series': {'type': 'string'},
-                                            'User': {'type': 'string'}},
-                             'required': ['Schema',
-                                          'User',
-                                          'Name',
-                                          'Revision',
-                                          'Series',
-                                          'Channel'],
-                             'type': 'object'},
                      'UnitStatus': {'additionalProperties': False,
-                                    'properties': {'AgentStatus': {'$ref': '#/definitions/DetailedStatus'},
-                                                   'Charm': {'type': 'string'},
-                                                   'Machine': {'type': 'string'},
-                                                   'OpenedPorts': {'items': {'type': 'string'},
-                                                                   'type': 'array'},
-                                                   'PublicAddress': {'type': 'string'},
-                                                   'Subordinates': {'patternProperties': {'.*': {'$ref': '#/definitions/UnitStatus'}},
+                                    'properties': {'agent-status': {'$ref': '#/definitions/DetailedStatus'},
+                                                   'charm': {'type': 'string'},
+                                                   'leader': {'type': 'boolean'},
+                                                   'machine': {'type': 'string'},
+                                                   'opened-ports': {'items': {'type': 'string'},
+                                                                    'type': 'array'},
+                                                   'public-address': {'type': 'string'},
+                                                   'subordinates': {'patternProperties': {'.*': {'$ref': '#/definitions/UnitStatus'}},
                                                                     'type': 'object'},
-                                                   'WorkloadStatus': {'$ref': '#/definitions/DetailedStatus'}},
-                                    'required': ['AgentStatus',
-                                                 'WorkloadStatus',
-                                                 'Machine',
-                                                 'OpenedPorts',
-                                                 'PublicAddress',
-                                                 'Charm',
-                                                 'Subordinates'],
+                                                   'workload-status': {'$ref': '#/definitions/DetailedStatus'},
+                                                   'workload-version': {'type': 'string'}},
+                                    'required': ['agent-status',
+                                                 'workload-status',
+                                                 'workload-version',
+                                                 'machine',
+                                                 'opened-ports',
+                                                 'public-address',
+                                                 'charm',
+                                                 'subordinates'],
                                     'type': 'object'},
                      'Value': {'additionalProperties': False,
                                'properties': {'arch': {'type': 'string'},
                                               'container': {'type': 'string'},
-                                              'cpu-cores': {'type': 'integer'},
+                                              'cores': {'type': 'integer'},
                                               'cpu-power': {'type': 'integer'},
                                               'instance-type': {'type': 'string'},
                                               'mem': {'type': 'integer'},
@@ -8292,21 +9255,7 @@ class ClientFacade(Type):
                                               'tags': {'items': {'type': 'string'},
                                                        'type': 'array'},
                                               'virt-type': {'type': 'string'}},
-                               'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                               'type': 'object'}},
      'properties': {'APIHostPorts': {'properties': {'Result': {'$ref': '#/definitions/APIHostPortsResult'}},
                                      'type': 'object'},
                     'AbortCurrentUpgrade': {'type': 'object'},
@@ -8322,20 +9271,16 @@ class ClientFacade(Type):
                                       'type': 'object'},
                     'AgentVersion': {'properties': {'Result': {'$ref': '#/definitions/AgentVersionResult'}},
                                      'type': 'object'},
-                    'CharmInfo': {'properties': {'Params': {'$ref': '#/definitions/CharmInfo'},
-                                                 'Result': {'$ref': '#/definitions/CharmInfo'}},
-                                  'type': 'object'},
                     'DestroyMachines': {'properties': {'Params': {'$ref': '#/definitions/DestroyMachines'}},
                                         'type': 'object'},
-                    'DestroyModel': {'type': 'object'},
                     'FindTools': {'properties': {'Params': {'$ref': '#/definitions/FindToolsParams'},
                                                  'Result': {'$ref': '#/definitions/FindToolsResult'}},
                                   'type': 'object'},
                     'FullStatus': {'properties': {'Params': {'$ref': '#/definitions/StatusParams'},
                                                   'Result': {'$ref': '#/definitions/FullStatus'}},
                                    'type': 'object'},
-                    'GetBundleChanges': {'properties': {'Params': {'$ref': '#/definitions/GetBundleChangesParams'},
-                                                        'Result': {'$ref': '#/definitions/GetBundleChangesResults'}},
+                    'GetBundleChanges': {'properties': {'Params': {'$ref': '#/definitions/BundleChangesParams'},
+                                                        'Result': {'$ref': '#/definitions/BundleChangesResults'}},
                                          'type': 'object'},
                     'GetModelConstraints': {'properties': {'Result': {'$ref': '#/definitions/GetConstraintsResults'}},
                                             'type': 'object'},
@@ -8385,11 +9330,11 @@ class ClientFacade(Type):
     async def APIHostPorts(self):
         '''
 
-        Returns -> typing.Sequence[~HostPort]
+        Returns -> typing.Sequence<+T_co>[~HostPort]<~HostPort>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='APIHostPorts', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Client', request='APIHostPorts', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -8403,8 +9348,8 @@ class ClientFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='AbortCurrentUpgrade', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Client', request='AbortCurrentUpgrade', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -8419,59 +9364,59 @@ class ClientFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='AddCharm', Version=1, Params=params)
-        params['Channel'] = channel
-        params['URL'] = url
+        _params = dict()
+        msg = dict(type='Client', request='AddCharm', version=1, params=_params)
+        _params['channel'] = channel
+        _params['url'] = url
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(None)
-    async def AddCharmWithAuthorization(self, channel, charmstoremacaroon, url):
+    async def AddCharmWithAuthorization(self, channel, macaroon, url):
         '''
         channel : str
-        charmstoremacaroon : Macaroon
+        macaroon : Macaroon
         url : str
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='AddCharmWithAuthorization', Version=1, Params=params)
-        params['Channel'] = channel
-        params['CharmStoreMacaroon'] = charmstoremacaroon
-        params['URL'] = url
+        _params = dict()
+        msg = dict(type='Client', request='AddCharmWithAuthorization', version=1, params=_params)
+        _params['channel'] = channel
+        _params['macaroon'] = macaroon
+        _params['url'] = url
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(AddMachinesResults)
-    async def AddMachines(self, machineparams):
+    async def AddMachines(self, params):
         '''
-        machineparams : typing.Sequence[~AddMachineParams]
-        Returns -> typing.Sequence[~AddMachinesResult]
+        params : typing.Sequence<+T_co>[~AddMachineParams]<~AddMachineParams>
+        Returns -> typing.Sequence<+T_co>[~AddMachinesResult]<~AddMachinesResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='AddMachines', Version=1, Params=params)
-        params['MachineParams'] = machineparams
+        _params = dict()
+        msg = dict(type='Client', request='AddMachines', version=1, params=_params)
+        _params['params'] = params
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(AddMachinesResults)
-    async def AddMachinesV2(self, machineparams):
+    async def AddMachinesV2(self, params):
         '''
-        machineparams : typing.Sequence[~AddMachineParams]
-        Returns -> typing.Sequence[~AddMachinesResult]
+        params : typing.Sequence<+T_co>[~AddMachineParams]<~AddMachineParams>
+        Returns -> typing.Sequence<+T_co>[~AddMachinesResult]<~AddMachinesResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='AddMachinesV2', Version=1, Params=params)
-        params['MachineParams'] = machineparams
+        _params = dict()
+        msg = dict(type='Client', request='AddMachinesV2', version=1, params=_params)
+        _params['params'] = params
         reply = await self.rpc(msg)
         return reply
 
@@ -8484,79 +9429,49 @@ class ClientFacade(Type):
         Returns -> Number
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='AgentVersion', Version=1, Params=params)
-
-        reply = await self.rpc(msg)
-        return reply
-
+        _params = dict()
+        msg = dict(type='Client', request='AgentVersion', version=1, params=_params)
 
-
-    @ReturnMapping(CharmInfo)
-    async def CharmInfo(self, charmurl):
-        '''
-        charmurl : str
-        Returns -> str
-        '''
-        # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='CharmInfo', Version=1, Params=params)
-        params['CharmURL'] = charmurl
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(None)
-    async def DestroyMachines(self, force, machinenames):
+    async def DestroyMachines(self, force, machine_names):
         '''
         force : bool
-        machinenames : typing.Sequence[str]
-        Returns -> None
-        '''
-        # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='DestroyMachines', Version=1, Params=params)
-        params['Force'] = force
-        params['MachineNames'] = machinenames
-        reply = await self.rpc(msg)
-        return reply
-
-
-
-    @ReturnMapping(None)
-    async def DestroyModel(self):
-        '''
-
+        machine_names : typing.Sequence<+T_co>[str]
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='DestroyModel', Version=1, Params=params)
-
+        _params = dict()
+        msg = dict(type='Client', request='DestroyMachines', version=1, params=_params)
+        _params['force'] = force
+        _params['machine-names'] = machine_names
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(FindToolsResult)
-    async def FindTools(self, arch, majorversion, minorversion, number, series):
+    async def FindTools(self, arch, major, minor, number, series):
         '''
         arch : str
-        majorversion : int
-        minorversion : int
+        major : int
+        minor : int
         number : Number
         series : str
-        Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence[~Tools]]
+        Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence<+T_co>[~Tools]<~Tools>]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='FindTools', Version=1, Params=params)
-        params['Arch'] = arch
-        params['MajorVersion'] = majorversion
-        params['MinorVersion'] = minorversion
-        params['Number'] = number
-        params['Series'] = series
+        _params = dict()
+        msg = dict(type='Client', request='FindTools', version=1, params=_params)
+        _params['arch'] = arch
+        _params['major'] = major
+        _params['minor'] = minor
+        _params['number'] = number
+        _params['series'] = series
         reply = await self.rpc(msg)
         return reply
 
@@ -8565,28 +9480,28 @@ class ClientFacade(Type):
     @ReturnMapping(FullStatus)
     async def FullStatus(self, patterns):
         '''
-        patterns : typing.Sequence[str]
-        Returns -> typing.Union[typing.Mapping[str, ~MachineStatus], typing.Sequence[~RelationStatus]]
+        patterns : typing.Sequence<+T_co>[str]
+        Returns -> typing.Union[_ForwardRef('ModelStatusInfo'), typing.Sequence<+T_co>[~RelationStatus]<~RelationStatus>, typing.Mapping<~KT, +VT_co>[str, ~RemoteApplicationStatus]<~RemoteApplicationStatus>]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='FullStatus', Version=1, Params=params)
-        params['Patterns'] = patterns
+        _params = dict()
+        msg = dict(type='Client', request='FullStatus', version=1, params=_params)
+        _params['patterns'] = patterns
         reply = await self.rpc(msg)
         return reply
 
 
 
-    @ReturnMapping(GetBundleChangesResults)
+    @ReturnMapping(BundleChangesResults)
     async def GetBundleChanges(self, yaml):
         '''
         yaml : str
-        Returns -> typing.Sequence[~BundleChangesChange]
+        Returns -> typing.Sequence<+T_co>[~BundleChange]<~BundleChange>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='GetBundleChanges', Version=1, Params=params)
-        params['yaml'] = yaml
+        _params = dict()
+        msg = dict(type='Client', request='GetBundleChanges', version=1, params=_params)
+        _params['yaml'] = yaml
         reply = await self.rpc(msg)
         return reply
 
@@ -8599,8 +9514,8 @@ class ClientFacade(Type):
         Returns -> Value
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='GetModelConstraints', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Client', request='GetModelConstraints', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -8608,15 +9523,15 @@ class ClientFacade(Type):
 
 
     @ReturnMapping(AddMachinesResults)
-    async def InjectMachines(self, machineparams):
+    async def InjectMachines(self, params):
         '''
-        machineparams : typing.Sequence[~AddMachineParams]
-        Returns -> typing.Sequence[~AddMachinesResult]
+        params : typing.Sequence<+T_co>[~AddMachineParams]<~AddMachineParams>
+        Returns -> typing.Sequence<+T_co>[~AddMachinesResult]<~AddMachinesResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='InjectMachines', Version=1, Params=params)
-        params['MachineParams'] = machineparams
+        _params = dict()
+        msg = dict(type='Client', request='InjectMachines', version=1, params=_params)
+        _params['params'] = params
         reply = await self.rpc(msg)
         return reply
 
@@ -8626,11 +9541,11 @@ class ClientFacade(Type):
     async def ModelGet(self):
         '''
 
-        Returns -> typing.Mapping[str, typing.Any]
+        Returns -> typing.Mapping<~KT, +VT_co>[str, ~ConfigValue]<~ConfigValue>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='ModelGet', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Client', request='ModelGet', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -8641,11 +9556,11 @@ class ClientFacade(Type):
     async def ModelInfo(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('EntityStatus'), typing.Sequence[~ModelUserInfo]]
+        Returns -> typing.Union[_ForwardRef('EntityStatus'), typing.Sequence<+T_co>[~ModelUserInfo]<~ModelUserInfo>]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='ModelInfo', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Client', request='ModelInfo', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -8655,13 +9570,13 @@ class ClientFacade(Type):
     @ReturnMapping(None)
     async def ModelSet(self, config):
         '''
-        config : typing.Mapping[str, typing.Any]
+        config : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='ModelSet', Version=1, Params=params)
-        params['Config'] = config
+        _params = dict()
+        msg = dict(type='Client', request='ModelSet', version=1, params=_params)
+        _params['config'] = config
         reply = await self.rpc(msg)
         return reply
 
@@ -8670,13 +9585,13 @@ class ClientFacade(Type):
     @ReturnMapping(None)
     async def ModelUnset(self, keys):
         '''
-        keys : typing.Sequence[str]
+        keys : typing.Sequence<+T_co>[str]
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='ModelUnset', Version=1, Params=params)
-        params['Keys'] = keys
+        _params = dict()
+        msg = dict(type='Client', request='ModelUnset', version=1, params=_params)
+        _params['keys'] = keys
         reply = await self.rpc(msg)
         return reply
 
@@ -8686,11 +9601,11 @@ class ClientFacade(Type):
     async def ModelUserInfo(self):
         '''
 
-        Returns -> typing.Sequence[~ModelUserInfoResult]
+        Returns -> typing.Sequence<+T_co>[~ModelUserInfoResult]<~ModelUserInfoResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='ModelUserInfo', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Client', request='ModelUserInfo', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -8704,30 +9619,30 @@ class ClientFacade(Type):
         Returns -> str
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='PrivateAddress', Version=1, Params=params)
-        params['Target'] = target
+        _params = dict()
+        msg = dict(type='Client', request='PrivateAddress', version=1, params=_params)
+        _params['target'] = target
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(ProvisioningScriptResult)
-    async def ProvisioningScript(self, datadir, disablepackagecommands, machineid, nonce):
+    async def ProvisioningScript(self, data_dir, disable_package_commands, machine_id, nonce):
         '''
-        datadir : str
-        disablepackagecommands : bool
-        machineid : str
+        data_dir : str
+        disable_package_commands : bool
+        machine_id : str
         nonce : str
         Returns -> str
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='ProvisioningScript', Version=1, Params=params)
-        params['DataDir'] = datadir
-        params['DisablePackageCommands'] = disablepackagecommands
-        params['MachineId'] = machineid
-        params['Nonce'] = nonce
+        _params = dict()
+        msg = dict(type='Client', request='ProvisioningScript', version=1, params=_params)
+        _params['data-dir'] = data_dir
+        _params['disable-package-commands'] = disable_package_commands
+        _params['machine-id'] = machine_id
+        _params['nonce'] = nonce
         reply = await self.rpc(msg)
         return reply
 
@@ -8740,9 +9655,9 @@ class ClientFacade(Type):
         Returns -> str
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='PublicAddress', Version=1, Params=params)
-        params['Target'] = target
+        _params = dict()
+        msg = dict(type='Client', request='PublicAddress', version=1, params=_params)
+        _params['target'] = target
         reply = await self.rpc(msg)
         return reply
 
@@ -8751,30 +9666,30 @@ class ClientFacade(Type):
     @ReturnMapping(ResolveCharmResults)
     async def ResolveCharms(self, references):
         '''
-        references : typing.Sequence[~URL]
-        Returns -> typing.Sequence[~ResolveCharmResult]
+        references : typing.Sequence<+T_co>[str]
+        Returns -> typing.Sequence<+T_co>[~ResolveCharmResult]<~ResolveCharmResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='ResolveCharms', Version=1, Params=params)
-        params['References'] = references
+        _params = dict()
+        msg = dict(type='Client', request='ResolveCharms', version=1, params=_params)
+        _params['references'] = references
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(None)
-    async def Resolved(self, retry, unitname):
+    async def Resolved(self, retry, unit_name):
         '''
         retry : bool
-        unitname : str
+        unit_name : str
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='Resolved', Version=1, Params=params)
-        params['Retry'] = retry
-        params['UnitName'] = unitname
+        _params = dict()
+        msg = dict(type='Client', request='Resolved', version=1, params=_params)
+        _params['retry'] = retry
+        _params['unit-name'] = unit_name
         reply = await self.rpc(msg)
         return reply
 
@@ -8783,53 +9698,45 @@ class ClientFacade(Type):
     @ReturnMapping(ErrorResults)
     async def RetryProvisioning(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='RetryProvisioning', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Client', request='RetryProvisioning', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(None)
-    async def SetModelAgentVersion(self, build, major, minor, patch, tag):
+    async def SetModelAgentVersion(self, version):
         '''
-        build : int
-        major : int
-        minor : int
-        patch : int
-        tag : str
+        version : Number
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='SetModelAgentVersion', Version=1, Params=params)
-        params['Build'] = build
-        params['Major'] = major
-        params['Minor'] = minor
-        params['Patch'] = patch
-        params['Tag'] = tag
+        _params = dict()
+        msg = dict(type='Client', request='SetModelAgentVersion', version=1, params=_params)
+        _params['version'] = version
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(None)
-    async def SetModelConstraints(self, applicationname, constraints):
+    async def SetModelConstraints(self, application, constraints):
         '''
-        applicationname : str
+        application : str
         constraints : Value
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='SetModelConstraints', Version=1, Params=params)
-        params['ApplicationName'] = applicationname
-        params['Constraints'] = constraints
+        _params = dict()
+        msg = dict(type='Client', request='SetModelConstraints', version=1, params=_params)
+        _params['application'] = application
+        _params['constraints'] = constraints
         reply = await self.rpc(msg)
         return reply
 
@@ -8838,13 +9745,13 @@ class ClientFacade(Type):
     @ReturnMapping(StatusHistoryResults)
     async def StatusHistory(self, requests):
         '''
-        requests : typing.Sequence[~StatusHistoryRequest]
-        Returns -> typing.Sequence[~StatusHistoryResult]
+        requests : typing.Sequence<+T_co>[~StatusHistoryRequest]<~StatusHistoryRequest>
+        Returns -> typing.Sequence<+T_co>[~StatusHistoryResult]<~StatusHistoryResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='StatusHistory', Version=1, Params=params)
-        params['Requests'] = requests
+        _params = dict()
+        msg = dict(type='Client', request='StatusHistory', version=1, params=_params)
+        _params['requests'] = requests
         reply = await self.rpc(msg)
         return reply
 
@@ -8857,449 +9764,859 @@ class ClientFacade(Type):
         Returns -> str
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Client', Request='WatchAll', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Client', request='WatchAll', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
 
 
-class ControllerFacade(Type):
-    name = 'Controller'
-    version = 3
-    schema =     {'definitions': {'AllWatcherId': {'additionalProperties': False,
-                                      'properties': {'AllWatcherId': {'type': 'string'}},
-                                      'required': ['AllWatcherId'],
-                                      'type': 'object'},
-                     'DestroyControllerArgs': {'additionalProperties': False,
-                                               'properties': {'destroy-models': {'type': 'boolean'}},
-                                               'required': ['destroy-models'],
+class CloudFacade(Type):
+    name = 'Cloud'
+    version = 1
+    schema =     {'definitions': {'Cloud': {'additionalProperties': False,
+                               'properties': {'auth-types': {'items': {'type': 'string'},
+                                                             'type': 'array'},
+                                              'endpoint': {'type': 'string'},
+                                              'identity-endpoint': {'type': 'string'},
+                                              'regions': {'items': {'$ref': '#/definitions/CloudRegion'},
+                                                          'type': 'array'},
+                                              'storage-endpoint': {'type': 'string'},
+                                              'type': {'type': 'string'}},
+                               'required': ['type'],
+                               'type': 'object'},
+                     'CloudCredential': {'additionalProperties': False,
+                                         'properties': {'attrs': {'patternProperties': {'.*': {'type': 'string'}},
+                                                                  'type': 'object'},
+                                                        'auth-type': {'type': 'string'},
+                                                        'redacted': {'items': {'type': 'string'},
+                                                                     'type': 'array'}},
+                                         'required': ['auth-type'],
+                                         'type': 'object'},
+                     'CloudCredentialResult': {'additionalProperties': False,
+                                               'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                              'result': {'$ref': '#/definitions/CloudCredential'}},
                                                'type': 'object'},
+                     'CloudCredentialResults': {'additionalProperties': False,
+                                                'properties': {'results': {'items': {'$ref': '#/definitions/CloudCredentialResult'},
+                                                                           'type': 'array'}},
+                                                'type': 'object'},
+                     'CloudRegion': {'additionalProperties': False,
+                                     'properties': {'endpoint': {'type': 'string'},
+                                                    'identity-endpoint': {'type': 'string'},
+                                                    'name': {'type': 'string'},
+                                                    'storage-endpoint': {'type': 'string'}},
+                                     'required': ['name'],
+                                     'type': 'object'},
+                     'CloudResult': {'additionalProperties': False,
+                                     'properties': {'cloud': {'$ref': '#/definitions/Cloud'},
+                                                    'error': {'$ref': '#/definitions/Error'}},
+                                     'type': 'object'},
+                     'CloudResults': {'additionalProperties': False,
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/CloudResult'},
+                                                                 'type': 'array'}},
+                                      'type': 'object'},
+                     'CloudsResult': {'additionalProperties': False,
+                                      'properties': {'clouds': {'patternProperties': {'.*': {'$ref': '#/definitions/Cloud'}},
+                                                                'type': 'object'}},
+                                      'type': 'object'},
                      'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
-                     'InitiateModelMigrationArgs': {'additionalProperties': False,
-                                                    'properties': {'specs': {'items': {'$ref': '#/definitions/ModelMigrationSpec'},
-                                                                             'type': 'array'}},
-                                                    'required': ['specs'],
-                                                    'type': 'object'},
-                     'InitiateModelMigrationResult': {'additionalProperties': False,
-                                                      'properties': {'error': {'$ref': '#/definitions/Error'},
-                                                                     'id': {'type': 'string'},
-                                                                     'model-tag': {'type': 'string'}},
-                                                      'required': ['model-tag',
-                                                                   'error',
-                                                                   'id'],
-                                                      'type': 'object'},
-                     'InitiateModelMigrationResults': {'additionalProperties': False,
-                                                       'properties': {'results': {'items': {'$ref': '#/definitions/InitiateModelMigrationResult'},
-                                                                                  'type': 'array'}},
-                                                       'required': ['results'],
-                                                       'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
-                     'Model': {'additionalProperties': False,
-                               'properties': {'Name': {'type': 'string'},
-                                              'OwnerTag': {'type': 'string'},
-                                              'UUID': {'type': 'string'}},
-                               'required': ['Name', 'UUID', 'OwnerTag'],
-                               'type': 'object'},
-                     'ModelBlockInfo': {'additionalProperties': False,
-                                        'properties': {'blocks': {'items': {'type': 'string'},
-                                                                  'type': 'array'},
-                                                       'model-uuid': {'type': 'string'},
-                                                       'name': {'type': 'string'},
-                                                       'owner-tag': {'type': 'string'}},
-                                        'required': ['name',
-                                                     'model-uuid',
-                                                     'owner-tag',
-                                                     'blocks'],
-                                        'type': 'object'},
-                     'ModelBlockInfoList': {'additionalProperties': False,
-                                            'properties': {'models': {'items': {'$ref': '#/definitions/ModelBlockInfo'},
-                                                                      'type': 'array'}},
-                                            'type': 'object'},
-                     'ModelConfigResults': {'additionalProperties': False,
-                                            'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True,
-                                                                                                   'type': 'object'}},
-                                                                      'type': 'object'}},
-                                            'required': ['Config'],
-                                            'type': 'object'},
-                     'ModelMigrationSpec': {'additionalProperties': False,
-                                            'properties': {'model-tag': {'type': 'string'},
-                                                           'target-info': {'$ref': '#/definitions/ModelMigrationTargetInfo'}},
-                                            'required': ['model-tag',
-                                                         'target-info'],
-                                            'type': 'object'},
-                     'ModelMigrationTargetInfo': {'additionalProperties': False,
-                                                  'properties': {'addrs': {'items': {'type': 'string'},
-                                                                           'type': 'array'},
-                                                                 'auth-tag': {'type': 'string'},
-                                                                 'ca-cert': {'type': 'string'},
-                                                                 'controller-tag': {'type': 'string'},
-                                                                 'password': {'type': 'string'}},
-                                                  'required': ['controller-tag',
-                                                               'addrs',
-                                                               'ca-cert',
-                                                               'auth-tag',
-                                                               'password'],
-                                                  'type': 'object'},
-                     'ModelStatus': {'additionalProperties': False,
-                                     'properties': {'application-count': {'type': 'integer'},
-                                                    'hosted-machine-count': {'type': 'integer'},
-                                                    'life': {'type': 'string'},
-                                                    'model-tag': {'type': 'string'},
-                                                    'owner-tag': {'type': 'string'}},
-                                     'required': ['model-tag',
-                                                  'life',
-                                                  'hosted-machine-count',
-                                                  'application-count',
-                                                  'owner-tag'],
+                     'ErrorResult': {'additionalProperties': False,
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
-                     'ModelStatusResults': {'additionalProperties': False,
-                                            'properties': {'models': {'items': {'$ref': '#/definitions/ModelStatus'},
-                                                                      'type': 'array'}},
-                                            'required': ['models'],
-                                            'type': 'object'},
-                     'RemoveBlocksArgs': {'additionalProperties': False,
-                                          'properties': {'all': {'type': 'boolean'}},
-                                          'required': ['all'],
-                                          'type': 'object'},
-                     'UserModel': {'additionalProperties': False,
-                                   'properties': {'LastConnection': {'format': 'date-time',
-                                                                     'type': 'string'},
-                                                  'Model': {'$ref': '#/definitions/Model'}},
-                                   'required': ['Model', 'LastConnection'],
-                                   'type': 'object'},
-                     'UserModelList': {'additionalProperties': False,
-                                       'properties': {'UserModels': {'items': {'$ref': '#/definitions/UserModel'},
-                                                                     'type': 'array'}},
-                                       'required': ['UserModels'],
+                     'ErrorResults': {'additionalProperties': False,
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                                                 'type': 'array'}},
+                                      'required': ['results'],
+                                      'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
+                     'StringResult': {'additionalProperties': False,
+                                      'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                     'result': {'type': 'string'}},
+                                      'required': ['result'],
+                                      'type': 'object'},
+                     'StringsResult': {'additionalProperties': False,
+                                       'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                      'result': {'items': {'type': 'string'},
+                                                                 'type': 'array'}},
                                        'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
-     'properties': {'AllModels': {'properties': {'Result': {'$ref': '#/definitions/UserModelList'}},
-                                  'type': 'object'},
-                    'DestroyController': {'properties': {'Params': {'$ref': '#/definitions/DestroyControllerArgs'}},
-                                          'type': 'object'},
-                    'InitiateModelMigration': {'properties': {'Params': {'$ref': '#/definitions/InitiateModelMigrationArgs'},
-                                                              'Result': {'$ref': '#/definitions/InitiateModelMigrationResults'}},
+                     'StringsResults': {'additionalProperties': False,
+                                        'properties': {'results': {'items': {'$ref': '#/definitions/StringsResult'},
+                                                                   'type': 'array'}},
+                                        'required': ['results'],
+                                        'type': 'object'},
+                     'UpdateCloudCredential': {'additionalProperties': False,
+                                               'properties': {'credential': {'$ref': '#/definitions/CloudCredential'},
+                                                              'tag': {'type': 'string'}},
+                                               'required': ['tag', 'credential'],
                                                'type': 'object'},
-                    'ListBlockedModels': {'properties': {'Result': {'$ref': '#/definitions/ModelBlockInfoList'}},
-                                          'type': 'object'},
-                    'ModelConfig': {'properties': {'Result': {'$ref': '#/definitions/ModelConfigResults'}},
-                                    'type': 'object'},
-                    'ModelStatus': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
-                                                   'Result': {'$ref': '#/definitions/ModelStatusResults'}},
-                                    'type': 'object'},
-                    'RemoveBlocks': {'properties': {'Params': {'$ref': '#/definitions/RemoveBlocksArgs'}},
+                     'UpdateCloudCredentials': {'additionalProperties': False,
+                                                'properties': {'credentials': {'items': {'$ref': '#/definitions/UpdateCloudCredential'},
+                                                                               'type': 'array'}},
+                                                'type': 'object'},
+                     'UserCloud': {'additionalProperties': False,
+                                   'properties': {'cloud-tag': {'type': 'string'},
+                                                  'user-tag': {'type': 'string'}},
+                                   'required': ['user-tag', 'cloud-tag'],
+                                   'type': 'object'},
+                     'UserClouds': {'additionalProperties': False,
+                                    'properties': {'user-clouds': {'items': {'$ref': '#/definitions/UserCloud'},
+                                                                   'type': 'array'}},
+                                    'type': 'object'}},
+     'properties': {'Cloud': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                             'Result': {'$ref': '#/definitions/CloudResults'}},
+                              'type': 'object'},
+                    'Clouds': {'properties': {'Result': {'$ref': '#/definitions/CloudsResult'}},
+                               'type': 'object'},
+                    'Credential': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                  'Result': {'$ref': '#/definitions/CloudCredentialResults'}},
+                                   'type': 'object'},
+                    'DefaultCloud': {'properties': {'Result': {'$ref': '#/definitions/StringResult'}},
                                      'type': 'object'},
-                    'WatchAllModels': {'properties': {'Result': {'$ref': '#/definitions/AllWatcherId'}},
-                                       'type': 'object'}},
+                    'RevokeCredentials': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                         'Result': {'$ref': '#/definitions/ErrorResults'}},
+                                          'type': 'object'},
+                    'UpdateCredentials': {'properties': {'Params': {'$ref': '#/definitions/UpdateCloudCredentials'},
+                                                         'Result': {'$ref': '#/definitions/ErrorResults'}},
+                                          'type': 'object'},
+                    'UserCredentials': {'properties': {'Params': {'$ref': '#/definitions/UserClouds'},
+                                                       'Result': {'$ref': '#/definitions/StringsResults'}},
+                                        'type': 'object'}},
      'type': 'object'}
     
 
-    @ReturnMapping(UserModelList)
-    async def AllModels(self):
+    @ReturnMapping(CloudResults)
+    async def Cloud(self, entities):
         '''
-
-        Returns -> typing.Sequence[~UserModel]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~CloudResult]<~CloudResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Controller', Request='AllModels', Version=3, Params=params)
-
+        _params = dict()
+        msg = dict(type='Cloud', request='Cloud', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
-    @ReturnMapping(None)
-    async def DestroyController(self, destroy_models):
-        '''
-        destroy_models : bool
-        Returns -> None
+    @ReturnMapping(CloudsResult)
+    async def Clouds(self):
         '''
-        # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Controller', Request='DestroyController', Version=3, Params=params)
-        params['destroy-models'] = destroy_models
-        reply = await self.rpc(msg)
-        return reply
-
 
-
-    @ReturnMapping(InitiateModelMigrationResults)
-    async def InitiateModelMigration(self, specs):
-        '''
-        specs : typing.Sequence[~ModelMigrationSpec]
-        Returns -> typing.Sequence[~InitiateModelMigrationResult]
+        Returns -> typing.Mapping<~KT, +VT_co>[str, ~Cloud]<~Cloud>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Controller', Request='InitiateModelMigration', Version=3, Params=params)
-        params['specs'] = specs
+        _params = dict()
+        msg = dict(type='Cloud', request='Clouds', version=1, params=_params)
+
         reply = await self.rpc(msg)
         return reply
 
 
 
-    @ReturnMapping(ModelBlockInfoList)
-    async def ListBlockedModels(self):
+    @ReturnMapping(CloudCredentialResults)
+    async def Credential(self, entities):
         '''
-
-        Returns -> typing.Sequence[~ModelBlockInfo]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~CloudCredentialResult]<~CloudCredentialResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Controller', Request='ListBlockedModels', Version=3, Params=params)
-
+        _params = dict()
+        msg = dict(type='Cloud', request='Credential', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
-    @ReturnMapping(ModelConfigResults)
-    async def ModelConfig(self):
+    @ReturnMapping(StringResult)
+    async def DefaultCloud(self):
         '''
 
-        Returns -> typing.Mapping[str, typing.Any]
+        Returns -> typing.Union[_ForwardRef('Error'), str]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Controller', Request='ModelConfig', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='Cloud', request='DefaultCloud', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
 
 
 
-    @ReturnMapping(ModelStatusResults)
-    async def ModelStatus(self, entities):
+    @ReturnMapping(ErrorResults)
+    async def RevokeCredentials(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ModelStatus]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Controller', Request='ModelStatus', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Cloud', request='RevokeCredentials', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
-    @ReturnMapping(None)
-    async def RemoveBlocks(self, all_):
+    @ReturnMapping(ErrorResults)
+    async def UpdateCredentials(self, credentials):
         '''
-        all_ : bool
-        Returns -> None
+        credentials : typing.Sequence<+T_co>[~UpdateCloudCredential]<~UpdateCloudCredential>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Controller', Request='RemoveBlocks', Version=3, Params=params)
-        params['all'] = all_
+        _params = dict()
+        msg = dict(type='Cloud', request='UpdateCredentials', version=1, params=_params)
+        _params['credentials'] = credentials
         reply = await self.rpc(msg)
         return reply
 
 
 
-    @ReturnMapping(AllWatcherId)
-    async def WatchAllModels(self):
+    @ReturnMapping(StringsResults)
+    async def UserCredentials(self, user_clouds):
         '''
-
-        Returns -> str
+        user_clouds : typing.Sequence<+T_co>[~UserCloud]<~UserCloud>
+        Returns -> typing.Sequence<+T_co>[~StringsResult]<~StringsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Controller', Request='WatchAllModels', Version=3, Params=params)
-
+        _params = dict()
+        msg = dict(type='Cloud', request='UserCredentials', version=1, params=_params)
+        _params['user-clouds'] = user_clouds
         reply = await self.rpc(msg)
         return reply
 
 
-class DeployerFacade(Type):
-    name = 'Deployer'
-    version = 1
-    schema =     {'definitions': {'APIHostPortsResult': {'additionalProperties': False,
-                                            'properties': {'Servers': {'items': {'items': {'$ref': '#/definitions/HostPort'},
-                                                                                 'type': 'array'},
-                                                                       'type': 'array'}},
-                                            'required': ['Servers'],
-                                            'type': 'object'},
-                     'Address': {'additionalProperties': False,
-                                 'properties': {'Scope': {'type': 'string'},
-                                                'SpaceName': {'type': 'string'},
-                                                'Type': {'type': 'string'},
-                                                'Value': {'type': 'string'}},
-                                 'required': ['Value', 'Type', 'Scope'],
-                                 'type': 'object'},
-                     'BytesResult': {'additionalProperties': False,
-                                     'properties': {'Result': {'items': {'type': 'integer'},
-                                                               'type': 'array'}},
-                                     'required': ['Result'],
-                                     'type': 'object'},
-                     'DeployerConnectionValues': {'additionalProperties': False,
-                                                  'properties': {'APIAddresses': {'items': {'type': 'string'},
-                                                                                  'type': 'array'},
-                                                                 'StateAddresses': {'items': {'type': 'string'},
-                                                                                    'type': 'array'}},
-                                                  'required': ['StateAddresses',
-                                                               'APIAddresses'],
-                                                  'type': 'object'},
-                     'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
-                                                              'type': 'array'}},
-                                  'required': ['Entities'],
-                                  'type': 'object'},
-                     'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+class ControllerFacade(Type):
+    name = 'Controller'
+    version = 3
+    schema =     {'definitions': {'AllWatcherId': {'additionalProperties': False,
+                                      'properties': {'watcher-id': {'type': 'string'}},
+                                      'required': ['watcher-id'],
+                                      'type': 'object'},
+                     'CloudCredential': {'additionalProperties': False,
+                                         'properties': {'attrs': {'patternProperties': {'.*': {'type': 'string'}},
+                                                                  'type': 'object'},
+                                                        'auth-type': {'type': 'string'},
+                                                        'redacted': {'items': {'type': 'string'},
+                                                                     'type': 'array'}},
+                                         'required': ['auth-type'],
+                                         'type': 'object'},
+                     'CloudSpec': {'additionalProperties': False,
+                                   'properties': {'credential': {'$ref': '#/definitions/CloudCredential'},
+                                                  'endpoint': {'type': 'string'},
+                                                  'identity-endpoint': {'type': 'string'},
+                                                  'name': {'type': 'string'},
+                                                  'region': {'type': 'string'},
+                                                  'storage-endpoint': {'type': 'string'},
+                                                  'type': {'type': 'string'}},
+                                   'required': ['type', 'name'],
+                                   'type': 'object'},
+                     'CloudSpecResult': {'additionalProperties': False,
+                                         'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                        'result': {'$ref': '#/definitions/CloudSpec'}},
+                                         'type': 'object'},
+                     'CloudSpecResults': {'additionalProperties': False,
+                                          'properties': {'results': {'items': {'$ref': '#/definitions/CloudSpecResult'},
+                                                                     'type': 'array'}},
+                                          'type': 'object'},
+                     'ConfigValue': {'additionalProperties': False,
+                                     'properties': {'source': {'type': 'string'},
+                                                    'value': {'additionalProperties': True,
+                                                              'type': 'object'}},
+                                     'required': ['value', 'source'],
+                                     'type': 'object'},
+                     'ControllerConfigResult': {'additionalProperties': False,
+                                                'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                                                                                       'type': 'object'}},
+                                                                          'type': 'object'}},
+                                                'required': ['config'],
+                                                'type': 'object'},
+                     'DestroyControllerArgs': {'additionalProperties': False,
+                                               'properties': {'destroy-models': {'type': 'boolean'}},
+                                               'required': ['destroy-models'],
+                                               'type': 'object'},
+                     'Entities': {'additionalProperties': False,
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
+                                                              'type': 'array'}},
+                                  'required': ['entities'],
+                                  'type': 'object'},
+                     'Entity': {'additionalProperties': False,
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
+                                'type': 'object'},
+                     'Error': {'additionalProperties': False,
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
+                               'type': 'object'},
+                     'ErrorInfo': {'additionalProperties': False,
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
+                                   'type': 'object'},
+                     'ErrorResult': {'additionalProperties': False,
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
+                                     'type': 'object'},
+                     'ErrorResults': {'additionalProperties': False,
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                                                 'type': 'array'}},
+                                      'required': ['results'],
+                                      'type': 'object'},
+                     'HostedModelConfig': {'additionalProperties': False,
+                                           'properties': {'cloud-spec': {'$ref': '#/definitions/CloudSpec'},
+                                                          'config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                                                                                  'type': 'object'}},
+                                                                     'type': 'object'},
+                                                          'error': {'$ref': '#/definitions/Error'},
+                                                          'name': {'type': 'string'},
+                                                          'owner': {'type': 'string'}},
+                                           'required': ['name', 'owner'],
+                                           'type': 'object'},
+                     'HostedModelConfigsResults': {'additionalProperties': False,
+                                                   'properties': {'models': {'items': {'$ref': '#/definitions/HostedModelConfig'},
+                                                                             'type': 'array'}},
+                                                   'required': ['models'],
+                                                   'type': 'object'},
+                     'InitiateMigrationArgs': {'additionalProperties': False,
+                                               'properties': {'specs': {'items': {'$ref': '#/definitions/MigrationSpec'},
+                                                                        'type': 'array'}},
+                                               'required': ['specs'],
+                                               'type': 'object'},
+                     'InitiateMigrationResult': {'additionalProperties': False,
+                                                 'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                                'migration-id': {'type': 'string'},
+                                                                'model-tag': {'type': 'string'}},
+                                                 'required': ['model-tag',
+                                                              'migration-id'],
+                                                 'type': 'object'},
+                     'InitiateMigrationResults': {'additionalProperties': False,
+                                                  'properties': {'results': {'items': {'$ref': '#/definitions/InitiateMigrationResult'},
+                                                                             'type': 'array'}},
+                                                  'required': ['results'],
+                                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
+                     'MachineHardware': {'additionalProperties': False,
+                                         'properties': {'arch': {'type': 'string'},
+                                                        'availability-zone': {'type': 'string'},
+                                                        'cores': {'type': 'integer'},
+                                                        'cpu-power': {'type': 'integer'},
+                                                        'mem': {'type': 'integer'},
+                                                        'root-disk': {'type': 'integer'},
+                                                        'tags': {'items': {'type': 'string'},
+                                                                 'type': 'array'}},
+                                         'type': 'object'},
+                     'MigrationSpec': {'additionalProperties': False,
+                                       'properties': {'external-control': {'type': 'boolean'},
+                                                      'model-tag': {'type': 'string'},
+                                                      'skip-initial-prechecks': {'type': 'boolean'},
+                                                      'target-info': {'$ref': '#/definitions/MigrationTargetInfo'}},
+                                       'required': ['model-tag',
+                                                    'target-info',
+                                                    'external-control',
+                                                    'skip-initial-prechecks'],
+                                       'type': 'object'},
+                     'MigrationTargetInfo': {'additionalProperties': False,
+                                             'properties': {'addrs': {'items': {'type': 'string'},
+                                                                      'type': 'array'},
+                                                            'auth-tag': {'type': 'string'},
+                                                            'ca-cert': {'type': 'string'},
+                                                            'controller-tag': {'type': 'string'},
+                                                            'macaroons': {'type': 'string'},
+                                                            'password': {'type': 'string'}},
+                                             'required': ['controller-tag',
+                                                          'addrs',
+                                                          'ca-cert',
+                                                          'auth-tag'],
+                                             'type': 'object'},
+                     'Model': {'additionalProperties': False,
+                               'properties': {'name': {'type': 'string'},
+                                              'owner-tag': {'type': 'string'},
+                                              'uuid': {'type': 'string'}},
+                               'required': ['name', 'uuid', 'owner-tag'],
+                               'type': 'object'},
+                     'ModelBlockInfo': {'additionalProperties': False,
+                                        'properties': {'blocks': {'items': {'type': 'string'},
+                                                                  'type': 'array'},
+                                                       'model-uuid': {'type': 'string'},
+                                                       'name': {'type': 'string'},
+                                                       'owner-tag': {'type': 'string'}},
+                                        'required': ['name',
+                                                     'model-uuid',
+                                                     'owner-tag',
+                                                     'blocks'],
+                                        'type': 'object'},
+                     'ModelBlockInfoList': {'additionalProperties': False,
+                                            'properties': {'models': {'items': {'$ref': '#/definitions/ModelBlockInfo'},
+                                                                      'type': 'array'}},
+                                            'type': 'object'},
+                     'ModelConfigResults': {'additionalProperties': False,
+                                            'properties': {'config': {'patternProperties': {'.*': {'$ref': '#/definitions/ConfigValue'}},
+                                                                      'type': 'object'}},
+                                            'required': ['config'],
+                                            'type': 'object'},
+                     'ModelMachineInfo': {'additionalProperties': False,
+                                          'properties': {'hardware': {'$ref': '#/definitions/MachineHardware'},
+                                                         'has-vote': {'type': 'boolean'},
+                                                         'id': {'type': 'string'},
+                                                         'instance-id': {'type': 'string'},
+                                                         'status': {'type': 'string'},
+                                                         'wants-vote': {'type': 'boolean'}},
+                                          'required': ['id'],
+                                          'type': 'object'},
+                     'ModelStatus': {'additionalProperties': False,
+                                     'properties': {'application-count': {'type': 'integer'},
+                                                    'hosted-machine-count': {'type': 'integer'},
+                                                    'life': {'type': 'string'},
+                                                    'machines': {'items': {'$ref': '#/definitions/ModelMachineInfo'},
+                                                                 'type': 'array'},
+                                                    'model-tag': {'type': 'string'},
+                                                    'owner-tag': {'type': 'string'}},
+                                     'required': ['model-tag',
+                                                  'life',
+                                                  'hosted-machine-count',
+                                                  'application-count',
+                                                  'owner-tag'],
+                                     'type': 'object'},
+                     'ModelStatusResults': {'additionalProperties': False,
+                                            'properties': {'models': {'items': {'$ref': '#/definitions/ModelStatus'},
+                                                                      'type': 'array'}},
+                                            'required': ['models'],
+                                            'type': 'object'},
+                     'ModelTag': {'additionalProperties': False, 'type': 'object'},
+                     'ModifyControllerAccess': {'additionalProperties': False,
+                                                'properties': {'access': {'type': 'string'},
+                                                               'action': {'type': 'string'},
+                                                               'user-tag': {'type': 'string'}},
+                                                'required': ['user-tag',
+                                                             'action',
+                                                             'access'],
+                                                'type': 'object'},
+                     'ModifyControllerAccessRequest': {'additionalProperties': False,
+                                                       'properties': {'changes': {'items': {'$ref': '#/definitions/ModifyControllerAccess'},
+                                                                                  'type': 'array'}},
+                                                       'required': ['changes'],
+                                                       'type': 'object'},
+                     'RemoveBlocksArgs': {'additionalProperties': False,
+                                          'properties': {'all': {'type': 'boolean'}},
+                                          'required': ['all'],
+                                          'type': 'object'},
+                     'UserAccess': {'additionalProperties': False,
+                                    'properties': {'access': {'type': 'string'},
+                                                   'user-tag': {'type': 'string'}},
+                                    'required': ['user-tag', 'access'],
+                                    'type': 'object'},
+                     'UserAccessResult': {'additionalProperties': False,
+                                          'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                         'result': {'$ref': '#/definitions/UserAccess'}},
+                                          'type': 'object'},
+                     'UserAccessResults': {'additionalProperties': False,
+                                           'properties': {'results': {'items': {'$ref': '#/definitions/UserAccessResult'},
+                                                                      'type': 'array'}},
+                                           'type': 'object'},
+                     'UserModel': {'additionalProperties': False,
+                                   'properties': {'last-connection': {'format': 'date-time',
+                                                                      'type': 'string'},
+                                                  'model': {'$ref': '#/definitions/Model'}},
+                                   'required': ['model', 'last-connection'],
+                                   'type': 'object'},
+                     'UserModelList': {'additionalProperties': False,
+                                       'properties': {'user-models': {'items': {'$ref': '#/definitions/UserModel'},
+                                                                      'type': 'array'}},
+                                       'required': ['user-models'],
+                                       'type': 'object'}},
+     'properties': {'AllModels': {'properties': {'Result': {'$ref': '#/definitions/UserModelList'}},
+                                  'type': 'object'},
+                    'CloudSpec': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                 'Result': {'$ref': '#/definitions/CloudSpecResults'}},
+                                  'type': 'object'},
+                    'ControllerConfig': {'properties': {'Result': {'$ref': '#/definitions/ControllerConfigResult'}},
+                                         'type': 'object'},
+                    'DestroyController': {'properties': {'Params': {'$ref': '#/definitions/DestroyControllerArgs'}},
+                                          'type': 'object'},
+                    'GetCloudSpec': {'properties': {'Params': {'$ref': '#/definitions/ModelTag'},
+                                                    'Result': {'$ref': '#/definitions/CloudSpecResult'}},
+                                     'type': 'object'},
+                    'GetControllerAccess': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                           'Result': {'$ref': '#/definitions/UserAccessResults'}},
+                                            'type': 'object'},
+                    'HostedModelConfigs': {'properties': {'Result': {'$ref': '#/definitions/HostedModelConfigsResults'}},
+                                           'type': 'object'},
+                    'InitiateMigration': {'properties': {'Params': {'$ref': '#/definitions/InitiateMigrationArgs'},
+                                                         'Result': {'$ref': '#/definitions/InitiateMigrationResults'}},
+                                          'type': 'object'},
+                    'ListBlockedModels': {'properties': {'Result': {'$ref': '#/definitions/ModelBlockInfoList'}},
+                                          'type': 'object'},
+                    'ModelConfig': {'properties': {'Result': {'$ref': '#/definitions/ModelConfigResults'}},
+                                    'type': 'object'},
+                    'ModelStatus': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                   'Result': {'$ref': '#/definitions/ModelStatusResults'}},
+                                    'type': 'object'},
+                    'ModifyControllerAccess': {'properties': {'Params': {'$ref': '#/definitions/ModifyControllerAccessRequest'},
+                                                              'Result': {'$ref': '#/definitions/ErrorResults'}},
+                                               'type': 'object'},
+                    'RemoveBlocks': {'properties': {'Params': {'$ref': '#/definitions/RemoveBlocksArgs'}},
+                                     'type': 'object'},
+                    'WatchAllModels': {'properties': {'Result': {'$ref': '#/definitions/AllWatcherId'}},
+                                       'type': 'object'}},
+     'type': 'object'}
+    
+
+    @ReturnMapping(UserModelList)
+    async def AllModels(self):
+        '''
+
+        Returns -> typing.Sequence<+T_co>[~UserModel]<~UserModel>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Controller', request='AllModels', version=3, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(CloudSpecResults)
+    async def CloudSpec(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~CloudSpecResult]<~CloudSpecResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Controller', request='CloudSpec', version=3, params=_params)
+        _params['entities'] = entities
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(ControllerConfigResult)
+    async def ControllerConfig(self):
+        '''
+
+        Returns -> typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Controller', request='ControllerConfig', version=3, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(None)
+    async def DestroyController(self, destroy_models):
+        '''
+        destroy_models : bool
+        Returns -> None
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Controller', request='DestroyController', version=3, params=_params)
+        _params['destroy-models'] = destroy_models
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(CloudSpecResult)
+    async def GetCloudSpec(self):
+        '''
+
+        Returns -> typing.Union[_ForwardRef('Error'), _ForwardRef('CloudSpec')]
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Controller', request='GetCloudSpec', version=3, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(UserAccessResults)
+    async def GetControllerAccess(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~UserAccessResult]<~UserAccessResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Controller', request='GetControllerAccess', version=3, params=_params)
+        _params['entities'] = entities
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(HostedModelConfigsResults)
+    async def HostedModelConfigs(self):
+        '''
+
+        Returns -> typing.Sequence<+T_co>[~HostedModelConfig]<~HostedModelConfig>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Controller', request='HostedModelConfigs', version=3, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(InitiateMigrationResults)
+    async def InitiateMigration(self, specs):
+        '''
+        specs : typing.Sequence<+T_co>[~MigrationSpec]<~MigrationSpec>
+        Returns -> typing.Sequence<+T_co>[~InitiateMigrationResult]<~InitiateMigrationResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Controller', request='InitiateMigration', version=3, params=_params)
+        _params['specs'] = specs
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(ModelBlockInfoList)
+    async def ListBlockedModels(self):
+        '''
+
+        Returns -> typing.Sequence<+T_co>[~ModelBlockInfo]<~ModelBlockInfo>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Controller', request='ListBlockedModels', version=3, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(ModelConfigResults)
+    async def ModelConfig(self):
+        '''
+
+        Returns -> typing.Mapping<~KT, +VT_co>[str, ~ConfigValue]<~ConfigValue>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Controller', request='ModelConfig', version=3, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(ModelStatusResults)
+    async def ModelStatus(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ModelStatus]<~ModelStatus>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Controller', request='ModelStatus', version=3, params=_params)
+        _params['entities'] = entities
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(ErrorResults)
+    async def ModifyControllerAccess(self, changes):
+        '''
+        changes : typing.Sequence<+T_co>[~ModifyControllerAccess]<~ModifyControllerAccess>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Controller', request='ModifyControllerAccess', version=3, params=_params)
+        _params['changes'] = changes
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(None)
+    async def RemoveBlocks(self, all_):
+        '''
+        all_ : bool
+        Returns -> None
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Controller', request='RemoveBlocks', version=3, params=_params)
+        _params['all'] = all_
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(AllWatcherId)
+    async def WatchAllModels(self):
+        '''
+
+        Returns -> str
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Controller', request='WatchAllModels', version=3, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
+class DeployerFacade(Type):
+    name = 'Deployer'
+    version = 1
+    schema =     {'definitions': {'APIHostPortsResult': {'additionalProperties': False,
+                                            'properties': {'servers': {'items': {'items': {'$ref': '#/definitions/HostPort'},
+                                                                                 'type': 'array'},
+                                                                       'type': 'array'}},
+                                            'required': ['servers'],
+                                            'type': 'object'},
+                     'Address': {'additionalProperties': False,
+                                 'properties': {'scope': {'type': 'string'},
+                                                'space-name': {'type': 'string'},
+                                                'type': {'type': 'string'},
+                                                'value': {'type': 'string'}},
+                                 'required': ['value', 'type', 'scope'],
+                                 'type': 'object'},
+                     'BytesResult': {'additionalProperties': False,
+                                     'properties': {'result': {'items': {'type': 'integer'},
+                                                               'type': 'array'}},
+                                     'required': ['result'],
+                                     'type': 'object'},
+                     'DeployerConnectionValues': {'additionalProperties': False,
+                                                  'properties': {'api-addresses': {'items': {'type': 'string'},
+                                                                                   'type': 'array'},
+                                                                 'state-addresses': {'items': {'type': 'string'},
+                                                                                     'type': 'array'}},
+                                                  'required': ['state-addresses',
+                                                               'api-addresses'],
+                                                  'type': 'object'},
+                     'Entities': {'additionalProperties': False,
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
+                                                              'type': 'array'}},
+                                  'required': ['entities'],
+                                  'type': 'object'},
+                     'Entity': {'additionalProperties': False,
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'EntityPassword': {'additionalProperties': False,
-                                        'properties': {'Password': {'type': 'string'},
-                                                       'Tag': {'type': 'string'}},
-                                        'required': ['Tag', 'Password'],
+                                        'properties': {'password': {'type': 'string'},
+                                                       'tag': {'type': 'string'}},
+                                        'required': ['tag', 'password'],
                                         'type': 'object'},
                      'EntityPasswords': {'additionalProperties': False,
-                                         'properties': {'Changes': {'items': {'$ref': '#/definitions/EntityPassword'},
+                                         'properties': {'changes': {'items': {'$ref': '#/definitions/EntityPassword'},
                                                                     'type': 'array'}},
-                                         'required': ['Changes'],
+                                         'required': ['changes'],
                                          'type': 'object'},
+                     'EntityStatusArgs': {'additionalProperties': False,
+                                          'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True,
+                                                                                               'type': 'object'}},
+                                                                  'type': 'object'},
+                                                         'info': {'type': 'string'},
+                                                         'status': {'type': 'string'},
+                                                         'tag': {'type': 'string'}},
+                                          'required': ['tag',
+                                                       'status',
+                                                       'info',
+                                                       'data'],
+                                          'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'HostPort': {'additionalProperties': False,
                                   'properties': {'Address': {'$ref': '#/definitions/Address'},
-                                                 'Port': {'type': 'integer'}},
-                                  'required': ['Address', 'Port'],
+                                                 'port': {'type': 'integer'}},
+                                  'required': ['Address', 'port'],
                                   'type': 'object'},
                      'LifeResult': {'additionalProperties': False,
-                                    'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                   'Life': {'type': 'string'}},
-                                    'required': ['Life', 'Error'],
+                                    'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                   'life': {'type': 'string'}},
+                                    'required': ['life'],
                                     'type': 'object'},
                      'LifeResults': {'additionalProperties': False,
-                                     'properties': {'Results': {'items': {'$ref': '#/definitions/LifeResult'},
+                                     'properties': {'results': {'items': {'$ref': '#/definitions/LifeResult'},
                                                                 'type': 'array'}},
-                                     'required': ['Results'],
+                                     'required': ['results'],
                                      'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
+                     'SetStatus': {'additionalProperties': False,
+                                   'properties': {'entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'},
+                                                               'type': 'array'}},
+                                   'required': ['entities'],
+                                   'type': 'object'},
                      'StringResult': {'additionalProperties': False,
-                                      'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                     'Result': {'type': 'string'}},
-                                      'required': ['Error', 'Result'],
+                                      'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                     'result': {'type': 'string'}},
+                                      'required': ['result'],
                                       'type': 'object'},
                      'StringsResult': {'additionalProperties': False,
-                                       'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                      'Result': {'items': {'type': 'string'},
+                                       'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                      'result': {'items': {'type': 'string'},
                                                                  'type': 'array'}},
-                                       'required': ['Error', 'Result'],
                                        'type': 'object'},
                      'StringsWatchResult': {'additionalProperties': False,
-                                            'properties': {'Changes': {'items': {'type': 'string'},
+                                            'properties': {'changes': {'items': {'type': 'string'},
                                                                        'type': 'array'},
-                                                           'Error': {'$ref': '#/definitions/Error'},
-                                                           'StringsWatcherId': {'type': 'string'}},
-                                            'required': ['StringsWatcherId',
-                                                         'Changes',
-                                                         'Error'],
+                                                           'error': {'$ref': '#/definitions/Error'},
+                                                           'watcher-id': {'type': 'string'}},
+                                            'required': ['watcher-id'],
                                             'type': 'object'},
                      'StringsWatchResults': {'additionalProperties': False,
-                                             'properties': {'Results': {'items': {'$ref': '#/definitions/StringsWatchResult'},
+                                             'properties': {'results': {'items': {'$ref': '#/definitions/StringsWatchResult'},
                                                                         'type': 'array'}},
-                                             'required': ['Results'],
-                                             'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                             'required': ['results'],
+                                             'type': 'object'}},
      'properties': {'APIAddresses': {'properties': {'Result': {'$ref': '#/definitions/StringsResult'}},
                                      'type': 'object'},
                     'APIHostPorts': {'properties': {'Result': {'$ref': '#/definitions/APIHostPortsResult'}},
@@ -9319,8 +10636,14 @@ class DeployerFacade(Type):
                     'SetPasswords': {'properties': {'Params': {'$ref': '#/definitions/EntityPasswords'},
                                                     'Result': {'$ref': '#/definitions/ErrorResults'}},
                                      'type': 'object'},
+                    'SetStatus': {'properties': {'Params': {'$ref': '#/definitions/SetStatus'},
+                                                 'Result': {'$ref': '#/definitions/ErrorResults'}},
+                                  'type': 'object'},
                     'StateAddresses': {'properties': {'Result': {'$ref': '#/definitions/StringsResult'}},
                                        'type': 'object'},
+                    'UpdateStatus': {'properties': {'Params': {'$ref': '#/definitions/SetStatus'},
+                                                    'Result': {'$ref': '#/definitions/ErrorResults'}},
+                                     'type': 'object'},
                     'WatchAPIHostPorts': {'properties': {'Result': {'$ref': '#/definitions/NotifyWatchResult'}},
                                           'type': 'object'},
                     'WatchUnits': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
@@ -9333,11 +10656,11 @@ class DeployerFacade(Type):
     async def APIAddresses(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence[str]]
+        Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence<+T_co>[str]]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Deployer', Request='APIAddresses', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Deployer', request='APIAddresses', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -9348,11 +10671,11 @@ class DeployerFacade(Type):
     async def APIHostPorts(self):
         '''
 
-        Returns -> typing.Sequence[~HostPort]
+        Returns -> typing.Sequence<+T_co>[~HostPort]<~HostPort>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Deployer', Request='APIHostPorts', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Deployer', request='APIHostPorts', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -9363,11 +10686,11 @@ class DeployerFacade(Type):
     async def CACert(self):
         '''
 
-        Returns -> typing.Sequence[int]
+        Returns -> typing.Sequence<+T_co>[int]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Deployer', Request='CACert', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Deployer', request='CACert', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -9378,11 +10701,11 @@ class DeployerFacade(Type):
     async def ConnectionInfo(self):
         '''
 
-        Returns -> typing.Sequence[str]
+        Returns -> typing.Sequence<+T_co>[str]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Deployer', Request='ConnectionInfo', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Deployer', request='ConnectionInfo', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -9392,13 +10715,13 @@ class DeployerFacade(Type):
     @ReturnMapping(LifeResults)
     async def Life(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~LifeResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~LifeResult]<~LifeResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Deployer', Request='Life', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Deployer', request='Life', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -9411,8 +10734,8 @@ class DeployerFacade(Type):
         Returns -> typing.Union[_ForwardRef('Error'), str]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Deployer', Request='ModelUUID', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Deployer', request='ModelUUID', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -9422,13 +10745,13 @@ class DeployerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def Remove(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Deployer', Request='Remove', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Deployer', request='Remove', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -9437,13 +10760,28 @@ class DeployerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetPasswords(self, changes):
         '''
-        changes : typing.Sequence[~EntityPassword]
-        Returns -> typing.Sequence[~ErrorResult]
+        changes : typing.Sequence<+T_co>[~EntityPassword]<~EntityPassword>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Deployer', Request='SetPasswords', Version=1, Params=params)
-        params['Changes'] = changes
+        _params = dict()
+        msg = dict(type='Deployer', request='SetPasswords', version=1, params=_params)
+        _params['changes'] = changes
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(ErrorResults)
+    async def SetStatus(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Deployer', request='SetStatus', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -9453,26 +10791,41 @@ class DeployerFacade(Type):
     async def StateAddresses(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence[str]]
+        Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence<+T_co>[str]]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Deployer', Request='StateAddresses', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Deployer', request='StateAddresses', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
 
 
 
+    @ReturnMapping(ErrorResults)
+    async def UpdateStatus(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Deployer', request='UpdateStatus', version=1, params=_params)
+        _params['entities'] = entities
+        reply = await self.rpc(msg)
+        return reply
+
+
+
     @ReturnMapping(NotifyWatchResult)
     async def WatchAPIHostPorts(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), str]
+        Returns -> typing.Union[str, _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Deployer', Request='WatchAPIHostPorts', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Deployer', request='WatchAPIHostPorts', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -9482,13 +10835,13 @@ class DeployerFacade(Type):
     @ReturnMapping(StringsWatchResults)
     async def WatchUnits(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringsWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringsWatchResult]<~StringsWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Deployer', Request='WatchUnits', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Deployer', request='WatchUnits', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -9497,130 +10850,97 @@ class DiscoverSpacesFacade(Type):
     name = 'DiscoverSpaces'
     version = 2
     schema =     {'definitions': {'AddSubnetParams': {'additionalProperties': False,
-                                         'properties': {'SpaceTag': {'type': 'string'},
-                                                        'SubnetProviderId': {'type': 'string'},
-                                                        'SubnetTag': {'type': 'string'},
-                                                        'Zones': {'items': {'type': 'string'},
+                                         'properties': {'space-tag': {'type': 'string'},
+                                                        'subnet-provider-id': {'type': 'string'},
+                                                        'subnet-tag': {'type': 'string'},
+                                                        'zones': {'items': {'type': 'string'},
                                                                   'type': 'array'}},
-                                         'required': ['SpaceTag'],
+                                         'required': ['space-tag'],
                                          'type': 'object'},
                      'AddSubnetsParams': {'additionalProperties': False,
-                                          'properties': {'Subnets': {'items': {'$ref': '#/definitions/AddSubnetParams'},
+                                          'properties': {'subnets': {'items': {'$ref': '#/definitions/AddSubnetParams'},
                                                                      'type': 'array'}},
-                                          'required': ['Subnets'],
+                                          'required': ['subnets'],
                                           'type': 'object'},
                      'CreateSpaceParams': {'additionalProperties': False,
-                                           'properties': {'ProviderId': {'type': 'string'},
-                                                          'Public': {'type': 'boolean'},
-                                                          'SpaceTag': {'type': 'string'},
-                                                          'SubnetTags': {'items': {'type': 'string'},
-                                                                         'type': 'array'}},
-                                           'required': ['SubnetTags',
-                                                        'SpaceTag',
-                                                        'Public'],
+                                           'properties': {'provider-id': {'type': 'string'},
+                                                          'public': {'type': 'boolean'},
+                                                          'space-tag': {'type': 'string'},
+                                                          'subnet-tags': {'items': {'type': 'string'},
+                                                                          'type': 'array'}},
+                                           'required': ['subnet-tags',
+                                                        'space-tag',
+                                                        'public'],
                                            'type': 'object'},
                      'CreateSpacesParams': {'additionalProperties': False,
-                                            'properties': {'Spaces': {'items': {'$ref': '#/definitions/CreateSpaceParams'},
+                                            'properties': {'spaces': {'items': {'$ref': '#/definitions/CreateSpaceParams'},
                                                                       'type': 'array'}},
-                                            'required': ['Spaces'],
+                                            'required': ['spaces'],
                                             'type': 'object'},
                      'DiscoverSpacesResults': {'additionalProperties': False,
-                                               'properties': {'Results': {'items': {'$ref': '#/definitions/ProviderSpace'},
+                                               'properties': {'results': {'items': {'$ref': '#/definitions/ProviderSpace'},
                                                                           'type': 'array'}},
-                                               'required': ['Results'],
+                                               'required': ['results'],
                                                'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'ListSubnetsResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/Subnet'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/Subnet'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
+                                            'required': ['results'],
                                             'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'ModelConfigResult': {'additionalProperties': False,
-                                           'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                           'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                   'type': 'object'}},
                                                                      'type': 'object'}},
-                                           'required': ['Config'],
+                                           'required': ['config'],
                                            'type': 'object'},
                      'ProviderSpace': {'additionalProperties': False,
-                                       'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                      'Name': {'type': 'string'},
-                                                      'ProviderId': {'type': 'string'},
-                                                      'Subnets': {'items': {'$ref': '#/definitions/Subnet'},
+                                       'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                      'name': {'type': 'string'},
+                                                      'provider-id': {'type': 'string'},
+                                                      'subnets': {'items': {'$ref': '#/definitions/Subnet'},
                                                                   'type': 'array'}},
-                                       'required': ['Name',
-                                                    'ProviderId',
-                                                    'Subnets'],
+                                       'required': ['name',
+                                                    'provider-id',
+                                                    'subnets'],
                                        'type': 'object'},
                      'Subnet': {'additionalProperties': False,
-                                'properties': {'CIDR': {'type': 'string'},
-                                               'Life': {'type': 'string'},
-                                               'ProviderId': {'type': 'string'},
-                                               'SpaceTag': {'type': 'string'},
-                                               'StaticRangeHighIP': {'items': {'type': 'integer'},
-                                                                     'type': 'array'},
-                                               'StaticRangeLowIP': {'items': {'type': 'integer'},
-                                                                    'type': 'array'},
-                                               'Status': {'type': 'string'},
-                                               'VLANTag': {'type': 'integer'},
-                                               'Zones': {'items': {'type': 'string'},
+                                'properties': {'cidr': {'type': 'string'},
+                                               'life': {'type': 'string'},
+                                               'provider-id': {'type': 'string'},
+                                               'space-tag': {'type': 'string'},
+                                               'status': {'type': 'string'},
+                                               'vlan-tag': {'type': 'integer'},
+                                               'zones': {'items': {'type': 'string'},
                                                          'type': 'array'}},
-                                'required': ['CIDR',
-                                             'VLANTag',
-                                             'Life',
-                                             'SpaceTag',
-                                             'Zones'],
+                                'required': ['cidr',
+                                             'vlan-tag',
+                                             'life',
+                                             'space-tag',
+                                             'zones'],
                                 'type': 'object'},
                      'SubnetsFilters': {'additionalProperties': False,
-                                        'properties': {'SpaceTag': {'type': 'string'},
-                                                       'Zone': {'type': 'string'}},
-                                        'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                        'properties': {'space-tag': {'type': 'string'},
+                                                       'zone': {'type': 'string'}},
+                                        'type': 'object'}},
      'properties': {'AddSubnets': {'properties': {'Params': {'$ref': '#/definitions/AddSubnetsParams'},
                                                   'Result': {'$ref': '#/definitions/ErrorResults'}},
                                    'type': 'object'},
@@ -9640,13 +10960,13 @@ class DiscoverSpacesFacade(Type):
     @ReturnMapping(ErrorResults)
     async def AddSubnets(self, subnets):
         '''
-        subnets : typing.Sequence[~AddSubnetParams]
-        Returns -> typing.Sequence[~ErrorResult]
+        subnets : typing.Sequence<+T_co>[~AddSubnetParams]<~AddSubnetParams>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='DiscoverSpaces', Request='AddSubnets', Version=2, Params=params)
-        params['Subnets'] = subnets
+        _params = dict()
+        msg = dict(type='DiscoverSpaces', request='AddSubnets', version=2, params=_params)
+        _params['subnets'] = subnets
         reply = await self.rpc(msg)
         return reply
 
@@ -9655,13 +10975,13 @@ class DiscoverSpacesFacade(Type):
     @ReturnMapping(ErrorResults)
     async def CreateSpaces(self, spaces):
         '''
-        spaces : typing.Sequence[~CreateSpaceParams]
-        Returns -> typing.Sequence[~ErrorResult]
+        spaces : typing.Sequence<+T_co>[~CreateSpaceParams]<~CreateSpaceParams>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='DiscoverSpaces', Request='CreateSpaces', Version=2, Params=params)
-        params['Spaces'] = spaces
+        _params = dict()
+        msg = dict(type='DiscoverSpaces', request='CreateSpaces', version=2, params=_params)
+        _params['spaces'] = spaces
         reply = await self.rpc(msg)
         return reply
 
@@ -9671,11 +10991,11 @@ class DiscoverSpacesFacade(Type):
     async def ListSpaces(self):
         '''
 
-        Returns -> typing.Sequence[~ProviderSpace]
+        Returns -> typing.Sequence<+T_co>[~ProviderSpace]<~ProviderSpace>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='DiscoverSpaces', Request='ListSpaces', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='DiscoverSpaces', request='ListSpaces', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -9683,17 +11003,17 @@ class DiscoverSpacesFacade(Type):
 
 
     @ReturnMapping(ListSubnetsResults)
-    async def ListSubnets(self, spacetag, zone):
+    async def ListSubnets(self, space_tag, zone):
         '''
-        spacetag : str
+        space_tag : str
         zone : str
-        Returns -> typing.Sequence[~Subnet]
+        Returns -> typing.Sequence<+T_co>[~Subnet]<~Subnet>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='DiscoverSpaces', Request='ListSubnets', Version=2, Params=params)
-        params['SpaceTag'] = spacetag
-        params['Zone'] = zone
+        _params = dict()
+        msg = dict(type='DiscoverSpaces', request='ListSubnets', version=2, params=_params)
+        _params['space-tag'] = space_tag
+        _params['zone'] = zone
         reply = await self.rpc(msg)
         return reply
 
@@ -9703,11 +11023,11 @@ class DiscoverSpacesFacade(Type):
     async def ModelConfig(self):
         '''
 
-        Returns -> typing.Mapping[str, typing.Any]
+        Returns -> typing.Mapping<~KT, +VT_co>[str, typing.Any]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='DiscoverSpaces', Request='ModelConfig', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='DiscoverSpaces', request='ModelConfig', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -9740,64 +11060,35 @@ class DiskManagerFacade(Type):
                                                   'MountPoint'],
                                      'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'MachineBlockDevices': {'additionalProperties': False,
-                                             'properties': {'blockdevices': {'items': {'$ref': '#/definitions/BlockDevice'},
-                                                                             'type': 'array'},
+                                             'properties': {'block-devices': {'items': {'$ref': '#/definitions/BlockDevice'},
+                                                                              'type': 'array'},
                                                             'machine': {'type': 'string'}},
                                              'required': ['machine'],
                                              'type': 'object'},
                      'SetMachineBlockDevices': {'additionalProperties': False,
-                                                'properties': {'machineblockdevices': {'items': {'$ref': '#/definitions/MachineBlockDevices'},
-                                                                                       'type': 'array'}},
-                                                'required': ['machineblockdevices'],
-                                                'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                                'properties': {'machine-block-devices': {'items': {'$ref': '#/definitions/MachineBlockDevices'},
+                                                                                         'type': 'array'}},
+                                                'required': ['machine-block-devices'],
+                                                'type': 'object'}},
      'properties': {'SetMachineBlockDevices': {'properties': {'Params': {'$ref': '#/definitions/SetMachineBlockDevices'},
                                                               'Result': {'$ref': '#/definitions/ErrorResults'}},
                                                'type': 'object'}},
@@ -9805,15 +11096,15 @@ class DiskManagerFacade(Type):
     
 
     @ReturnMapping(ErrorResults)
-    async def SetMachineBlockDevices(self, machineblockdevices):
+    async def SetMachineBlockDevices(self, machine_block_devices):
         '''
-        machineblockdevices : typing.Sequence[~MachineBlockDevices]
-        Returns -> typing.Sequence[~ErrorResult]
+        machine_block_devices : typing.Sequence<+T_co>[~MachineBlockDevices]<~MachineBlockDevices>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='DiskManager', Request='SetMachineBlockDevices', Version=2, Params=params)
-        params['machineblockdevices'] = machineblockdevices
+        _params = dict()
+        msg = dict(type='DiskManager', request='SetMachineBlockDevices', version=2, params=_params)
+        _params['machine-block-devices'] = machine_block_devices
         reply = await self.rpc(msg)
         return reply
 
@@ -9822,53 +11113,23 @@ class EntityWatcherFacade(Type):
     name = 'EntityWatcher'
     version = 2
     schema =     {'definitions': {'EntitiesWatchResult': {'additionalProperties': False,
-                                             'properties': {'Changes': {'items': {'type': 'string'},
+                                             'properties': {'changes': {'items': {'type': 'string'},
                                                                         'type': 'array'},
-                                                            'EntityWatcherId': {'type': 'string'},
-                                                            'Error': {'$ref': '#/definitions/Error'}},
-                                             'required': ['EntityWatcherId',
-                                                          'Changes',
-                                                          'Error'],
+                                                            'error': {'$ref': '#/definitions/Error'},
+                                                            'watcher-id': {'type': 'string'}},
+                                             'required': ['watcher-id'],
                                              'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'}},
      'properties': {'Next': {'properties': {'Result': {'$ref': '#/definitions/EntitiesWatchResult'}},
                              'type': 'object'},
                     'Stop': {'type': 'object'}},
@@ -9879,11 +11140,11 @@ class EntityWatcherFacade(Type):
     async def Next(self):
         '''
 
-        Returns -> typing.Union[typing.Sequence[str], _ForwardRef('Error')]
+        Returns -> typing.Union[typing.Sequence<+T_co>[str], _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='EntityWatcher', Request='Next', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='EntityWatcher', request='Next', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -9897,8 +11158,8 @@ class EntityWatcherFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='EntityWatcher', Request='Stop', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='EntityWatcher', request='Stop', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -9908,59 +11169,30 @@ class FilesystemAttachmentsWatcherFacade(Type):
     name = 'FilesystemAttachmentsWatcher'
     version = 2
     schema =     {'definitions': {'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'MachineStorageId': {'additionalProperties': False,
-                                          'properties': {'attachmenttag': {'type': 'string'},
-                                                         'machinetag': {'type': 'string'}},
-                                          'required': ['machinetag',
-                                                       'attachmenttag'],
+                                          'properties': {'attachment-tag': {'type': 'string'},
+                                                         'machine-tag': {'type': 'string'}},
+                                          'required': ['machine-tag',
+                                                       'attachment-tag'],
                                           'type': 'object'},
                      'MachineStorageIdsWatchResult': {'additionalProperties': False,
-                                                      'properties': {'Changes': {'items': {'$ref': '#/definitions/MachineStorageId'},
+                                                      'properties': {'changes': {'items': {'$ref': '#/definitions/MachineStorageId'},
                                                                                  'type': 'array'},
-                                                                     'Error': {'$ref': '#/definitions/Error'},
-                                                                     'MachineStorageIdsWatcherId': {'type': 'string'}},
-                                                      'required': ['MachineStorageIdsWatcherId',
-                                                                   'Changes',
-                                                                   'Error'],
-                                                      'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                                                     'error': {'$ref': '#/definitions/Error'},
+                                                                     'watcher-id': {'type': 'string'}},
+                                                      'required': ['watcher-id',
+                                                                   'changes'],
+                                                      'type': 'object'}},
      'properties': {'Next': {'properties': {'Result': {'$ref': '#/definitions/MachineStorageIdsWatchResult'}},
                              'type': 'object'},
                     'Stop': {'type': 'object'}},
@@ -9971,11 +11203,11 @@ class FilesystemAttachmentsWatcherFacade(Type):
     async def Next(self):
         '''
 
-        Returns -> typing.Union[typing.Sequence[~MachineStorageId], _ForwardRef('Error')]
+        Returns -> typing.Union[typing.Sequence<+T_co>[~MachineStorageId]<~MachineStorageId>, _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='FilesystemAttachmentsWatcher', Request='Next', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='FilesystemAttachmentsWatcher', request='Next', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -9989,8 +11221,8 @@ class FilesystemAttachmentsWatcherFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='FilesystemAttachmentsWatcher', Request='Stop', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='FilesystemAttachmentsWatcher', request='Stop', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -10000,162 +11232,164 @@ class FirewallerFacade(Type):
     name = 'Firewaller'
     version = 3
     schema =     {'definitions': {'BoolResult': {'additionalProperties': False,
-                                    'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                   'Result': {'type': 'boolean'}},
-                                    'required': ['Error', 'Result'],
+                                    'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                   'result': {'type': 'boolean'}},
+                                    'required': ['result'],
                                     'type': 'object'},
                      'BoolResults': {'additionalProperties': False,
-                                     'properties': {'Results': {'items': {'$ref': '#/definitions/BoolResult'},
+                                     'properties': {'results': {'items': {'$ref': '#/definitions/BoolResult'},
                                                                 'type': 'array'}},
-                                     'required': ['Results'],
+                                     'required': ['results'],
                                      'type': 'object'},
+                     'CloudCredential': {'additionalProperties': False,
+                                         'properties': {'attrs': {'patternProperties': {'.*': {'type': 'string'}},
+                                                                  'type': 'object'},
+                                                        'auth-type': {'type': 'string'},
+                                                        'redacted': {'items': {'type': 'string'},
+                                                                     'type': 'array'}},
+                                         'required': ['auth-type'],
+                                         'type': 'object'},
+                     'CloudSpec': {'additionalProperties': False,
+                                   'properties': {'credential': {'$ref': '#/definitions/CloudCredential'},
+                                                  'endpoint': {'type': 'string'},
+                                                  'identity-endpoint': {'type': 'string'},
+                                                  'name': {'type': 'string'},
+                                                  'region': {'type': 'string'},
+                                                  'storage-endpoint': {'type': 'string'},
+                                                  'type': {'type': 'string'}},
+                                   'required': ['type', 'name'],
+                                   'type': 'object'},
+                     'CloudSpecResult': {'additionalProperties': False,
+                                         'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                        'result': {'$ref': '#/definitions/CloudSpec'}},
+                                         'type': 'object'},
+                     'CloudSpecResults': {'additionalProperties': False,
+                                          'properties': {'results': {'items': {'$ref': '#/definitions/CloudSpecResult'},
+                                                                     'type': 'array'}},
+                                          'type': 'object'},
                      'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'LifeResult': {'additionalProperties': False,
-                                    'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                   'Life': {'type': 'string'}},
-                                    'required': ['Life', 'Error'],
+                                    'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                   'life': {'type': 'string'}},
+                                    'required': ['life'],
                                     'type': 'object'},
                      'LifeResults': {'additionalProperties': False,
-                                     'properties': {'Results': {'items': {'$ref': '#/definitions/LifeResult'},
+                                     'properties': {'results': {'items': {'$ref': '#/definitions/LifeResult'},
                                                                 'type': 'array'}},
-                                     'required': ['Results'],
+                                     'required': ['results'],
                                      'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'MachinePortRange': {'additionalProperties': False,
-                                          'properties': {'PortRange': {'$ref': '#/definitions/PortRange'},
-                                                         'RelationTag': {'type': 'string'},
-                                                         'UnitTag': {'type': 'string'}},
-                                          'required': ['UnitTag',
-                                                       'RelationTag',
-                                                       'PortRange'],
+                                          'properties': {'port-range': {'$ref': '#/definitions/PortRange'},
+                                                         'relation-tag': {'type': 'string'},
+                                                         'unit-tag': {'type': 'string'}},
+                                          'required': ['unit-tag',
+                                                       'relation-tag',
+                                                       'port-range'],
                                           'type': 'object'},
                      'MachinePorts': {'additionalProperties': False,
-                                      'properties': {'MachineTag': {'type': 'string'},
-                                                     'SubnetTag': {'type': 'string'}},
-                                      'required': ['MachineTag', 'SubnetTag'],
+                                      'properties': {'machine-tag': {'type': 'string'},
+                                                     'subnet-tag': {'type': 'string'}},
+                                      'required': ['machine-tag', 'subnet-tag'],
                                       'type': 'object'},
                      'MachinePortsParams': {'additionalProperties': False,
-                                            'properties': {'Params': {'items': {'$ref': '#/definitions/MachinePorts'},
+                                            'properties': {'params': {'items': {'$ref': '#/definitions/MachinePorts'},
                                                                       'type': 'array'}},
-                                            'required': ['Params'],
+                                            'required': ['params'],
                                             'type': 'object'},
                      'MachinePortsResult': {'additionalProperties': False,
-                                            'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                           'Ports': {'items': {'$ref': '#/definitions/MachinePortRange'},
+                                            'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                           'ports': {'items': {'$ref': '#/definitions/MachinePortRange'},
                                                                      'type': 'array'}},
-                                            'required': ['Error', 'Ports'],
+                                            'required': ['ports'],
                                             'type': 'object'},
                      'MachinePortsResults': {'additionalProperties': False,
-                                             'properties': {'Results': {'items': {'$ref': '#/definitions/MachinePortsResult'},
+                                             'properties': {'results': {'items': {'$ref': '#/definitions/MachinePortsResult'},
                                                                         'type': 'array'}},
-                                             'required': ['Results'],
+                                             'required': ['results'],
                                              'type': 'object'},
                      'ModelConfigResult': {'additionalProperties': False,
-                                           'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                           'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                   'type': 'object'}},
                                                                      'type': 'object'}},
-                                           'required': ['Config'],
+                                           'required': ['config'],
                                            'type': 'object'},
+                     'ModelTag': {'additionalProperties': False, 'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
                      'NotifyWatchResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
+                                            'required': ['results'],
                                             'type': 'object'},
                      'PortRange': {'additionalProperties': False,
-                                   'properties': {'FromPort': {'type': 'integer'},
-                                                  'Protocol': {'type': 'string'},
-                                                  'ToPort': {'type': 'integer'}},
-                                   'required': ['FromPort', 'ToPort', 'Protocol'],
+                                   'properties': {'from-port': {'type': 'integer'},
+                                                  'protocol': {'type': 'string'},
+                                                  'to-port': {'type': 'integer'}},
+                                   'required': ['from-port', 'to-port', 'protocol'],
                                    'type': 'object'},
                      'StringResult': {'additionalProperties': False,
-                                      'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                     'Result': {'type': 'string'}},
-                                      'required': ['Error', 'Result'],
+                                      'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                     'result': {'type': 'string'}},
+                                      'required': ['result'],
                                       'type': 'object'},
                      'StringResults': {'additionalProperties': False,
-                                       'properties': {'Results': {'items': {'$ref': '#/definitions/StringResult'},
+                                       'properties': {'results': {'items': {'$ref': '#/definitions/StringResult'},
                                                                   'type': 'array'}},
-                                       'required': ['Results'],
+                                       'required': ['results'],
                                        'type': 'object'},
                      'StringsResult': {'additionalProperties': False,
-                                       'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                      'Result': {'items': {'type': 'string'},
+                                       'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                      'result': {'items': {'type': 'string'},
                                                                  'type': 'array'}},
-                                       'required': ['Error', 'Result'],
                                        'type': 'object'},
                      'StringsResults': {'additionalProperties': False,
-                                        'properties': {'Results': {'items': {'$ref': '#/definitions/StringsResult'},
+                                        'properties': {'results': {'items': {'$ref': '#/definitions/StringsResult'},
                                                                    'type': 'array'}},
-                                        'required': ['Results'],
+                                        'required': ['results'],
                                         'type': 'object'},
                      'StringsWatchResult': {'additionalProperties': False,
-                                            'properties': {'Changes': {'items': {'type': 'string'},
+                                            'properties': {'changes': {'items': {'type': 'string'},
                                                                        'type': 'array'},
-                                                           'Error': {'$ref': '#/definitions/Error'},
-                                                           'StringsWatcherId': {'type': 'string'}},
-                                            'required': ['StringsWatcherId',
-                                                         'Changes',
-                                                         'Error'],
+                                                           'error': {'$ref': '#/definitions/Error'},
+                                                           'watcher-id': {'type': 'string'}},
+                                            'required': ['watcher-id'],
                                             'type': 'object'},
                      'StringsWatchResults': {'additionalProperties': False,
-                                             'properties': {'Results': {'items': {'$ref': '#/definitions/StringsWatchResult'},
+                                             'properties': {'results': {'items': {'$ref': '#/definitions/StringsWatchResult'},
                                                                         'type': 'array'}},
-                                             'required': ['Results'],
-                                             'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
-     'properties': {'GetAssignedMachine': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                             'required': ['results'],
+                                             'type': 'object'}},
+     'properties': {'CloudSpec': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                 'Result': {'$ref': '#/definitions/CloudSpecResults'}},
+                                  'type': 'object'},
+                    'GetAssignedMachine': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                           'Result': {'$ref': '#/definitions/StringResults'}},
                                            'type': 'object'},
+                    'GetCloudSpec': {'properties': {'Params': {'$ref': '#/definitions/ModelTag'},
+                                                    'Result': {'$ref': '#/definitions/CloudSpecResult'}},
+                                     'type': 'object'},
                     'GetExposed': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                   'Result': {'$ref': '#/definitions/BoolResults'}},
                                    'type': 'object'},
@@ -10189,16 +11423,46 @@ class FirewallerFacade(Type):
      'type': 'object'}
     
 
+    @ReturnMapping(CloudSpecResults)
+    async def CloudSpec(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~CloudSpecResult]<~CloudSpecResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Firewaller', request='CloudSpec', version=3, params=_params)
+        _params['entities'] = entities
+        reply = await self.rpc(msg)
+        return reply
+
+
+
     @ReturnMapping(StringResults)
     async def GetAssignedMachine(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringResult]<~StringResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Firewaller', Request='GetAssignedMachine', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Firewaller', request='GetAssignedMachine', version=3, params=_params)
+        _params['entities'] = entities
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(CloudSpecResult)
+    async def GetCloudSpec(self):
+        '''
+
+        Returns -> typing.Union[_ForwardRef('Error'), _ForwardRef('CloudSpec')]
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Firewaller', request='GetCloudSpec', version=3, params=_params)
+
         reply = await self.rpc(msg)
         return reply
 
@@ -10207,13 +11471,13 @@ class FirewallerFacade(Type):
     @ReturnMapping(BoolResults)
     async def GetExposed(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~BoolResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~BoolResult]<~BoolResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Firewaller', Request='GetExposed', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Firewaller', request='GetExposed', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -10222,13 +11486,13 @@ class FirewallerFacade(Type):
     @ReturnMapping(StringsResults)
     async def GetMachineActiveSubnets(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringsResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringsResult]<~StringsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Firewaller', Request='GetMachineActiveSubnets', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Firewaller', request='GetMachineActiveSubnets', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -10237,13 +11501,13 @@ class FirewallerFacade(Type):
     @ReturnMapping(MachinePortsResults)
     async def GetMachinePorts(self, params):
         '''
-        params : typing.Sequence[~MachinePorts]
-        Returns -> typing.Sequence[~MachinePortsResult]
+        params : typing.Sequence<+T_co>[~MachinePorts]<~MachinePorts>
+        Returns -> typing.Sequence<+T_co>[~MachinePortsResult]<~MachinePortsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Firewaller', Request='GetMachinePorts', Version=3, Params=params)
-        params['Params'] = params
+        _params = dict()
+        msg = dict(type='Firewaller', request='GetMachinePorts', version=3, params=_params)
+        _params['params'] = params
         reply = await self.rpc(msg)
         return reply
 
@@ -10252,13 +11516,13 @@ class FirewallerFacade(Type):
     @ReturnMapping(StringResults)
     async def InstanceId(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringResult]<~StringResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Firewaller', Request='InstanceId', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Firewaller', request='InstanceId', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -10267,13 +11531,13 @@ class FirewallerFacade(Type):
     @ReturnMapping(LifeResults)
     async def Life(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~LifeResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~LifeResult]<~LifeResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Firewaller', Request='Life', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Firewaller', request='Life', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -10283,11 +11547,11 @@ class FirewallerFacade(Type):
     async def ModelConfig(self):
         '''
 
-        Returns -> typing.Mapping[str, typing.Any]
+        Returns -> typing.Mapping<~KT, +VT_co>[str, typing.Any]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Firewaller', Request='ModelConfig', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='Firewaller', request='ModelConfig', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -10297,13 +11561,13 @@ class FirewallerFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def Watch(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Firewaller', Request='Watch', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Firewaller', request='Watch', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -10313,11 +11577,11 @@ class FirewallerFacade(Type):
     async def WatchForModelConfigChanges(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), str]
+        Returns -> typing.Union[str, _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Firewaller', Request='WatchForModelConfigChanges', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='Firewaller', request='WatchForModelConfigChanges', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -10328,11 +11592,11 @@ class FirewallerFacade(Type):
     async def WatchModelMachines(self):
         '''
 
-        Returns -> typing.Union[typing.Sequence[str], _ForwardRef('Error')]
+        Returns -> typing.Union[typing.Sequence<+T_co>[str], _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Firewaller', Request='WatchModelMachines', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='Firewaller', request='WatchModelMachines', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -10342,13 +11606,13 @@ class FirewallerFacade(Type):
     @ReturnMapping(StringsWatchResults)
     async def WatchOpenedPorts(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringsWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringsWatchResult]<~StringsWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Firewaller', Request='WatchOpenedPorts', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Firewaller', request='WatchOpenedPorts', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -10357,13 +11621,13 @@ class FirewallerFacade(Type):
     @ReturnMapping(StringsWatchResults)
     async def WatchUnits(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringsWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringsWatchResult]<~StringsWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Firewaller', Request='WatchUnits', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Firewaller', request='WatchUnits', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -10384,14 +11648,14 @@ class HighAvailabilityFacade(Type):
                                               'SpaceProviderId'],
                                  'type': 'object'},
                      'ControllersChangeResult': {'additionalProperties': False,
-                                                 'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                                'Result': {'$ref': '#/definitions/ControllersChanges'}},
-                                                 'required': ['Result', 'Error'],
+                                                 'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                                'result': {'$ref': '#/definitions/ControllersChanges'}},
+                                                 'required': ['result'],
                                                  'type': 'object'},
                      'ControllersChangeResults': {'additionalProperties': False,
-                                                  'properties': {'Results': {'items': {'$ref': '#/definitions/ControllersChangeResult'},
+                                                  'properties': {'results': {'items': {'$ref': '#/definitions/ControllersChangeResult'},
                                                                              'type': 'array'}},
-                                                  'required': ['Results'],
+                                                  'required': ['results'],
                                                   'type': 'object'},
                      'ControllersChanges': {'additionalProperties': False,
                                             'properties': {'added': {'items': {'type': 'string'},
@@ -10408,51 +11672,35 @@ class HighAvailabilityFacade(Type):
                                                                        'type': 'array'}},
                                             'type': 'object'},
                      'ControllersSpec': {'additionalProperties': False,
-                                         'properties': {'ModelTag': {'type': 'string'},
-                                                        'constraints': {'$ref': '#/definitions/Value'},
+                                         'properties': {'constraints': {'$ref': '#/definitions/Value'},
                                                         'num-controllers': {'type': 'integer'},
                                                         'placement': {'items': {'type': 'string'},
                                                                       'type': 'array'},
                                                         'series': {'type': 'string'}},
-                                         'required': ['ModelTag',
-                                                      'num-controllers'],
+                                         'required': ['num-controllers'],
                                          'type': 'object'},
                      'ControllersSpecs': {'additionalProperties': False,
-                                          'properties': {'Specs': {'items': {'$ref': '#/definitions/ControllersSpec'},
+                                          'properties': {'specs': {'items': {'$ref': '#/definitions/ControllersSpec'},
                                                                    'type': 'array'}},
-                                          'required': ['Specs'],
+                                          'required': ['specs'],
                                           'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'HAMember': {'additionalProperties': False,
-                                  'properties': {'PublicAddress': {'$ref': '#/definitions/Address'},
-                                                 'Series': {'type': 'string'},
-                                                 'Tag': {'type': 'string'}},
-                                  'required': ['Tag', 'PublicAddress', 'Series'],
-                                  'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
+                                  'properties': {'public-address': {'$ref': '#/definitions/Address'},
+                                                 'series': {'type': 'string'},
+                                                 'tag': {'type': 'string'}},
+                                  'required': ['tag', 'public-address', 'series'],
                                   'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'Member': {'additionalProperties': False,
                                 'properties': {'Address': {'type': 'string'},
                                                'Arbiter': {'type': 'boolean'},
@@ -10475,28 +11723,38 @@ class HighAvailabilityFacade(Type):
                                              'Votes'],
                                 'type': 'object'},
                      'MongoUpgradeResults': {'additionalProperties': False,
-                                             'properties': {'Master': {'$ref': '#/definitions/HAMember'},
-                                                            'Members': {'items': {'$ref': '#/definitions/HAMember'},
-                                                                        'type': 'array'},
-                                                            'RsMembers': {'items': {'$ref': '#/definitions/Member'},
-                                                                          'type': 'array'}},
-                                             'required': ['RsMembers',
-                                                          'Master',
-                                                          'Members'],
+                                             'properties': {'ha-members': {'items': {'$ref': '#/definitions/HAMember'},
+                                                                           'type': 'array'},
+                                                            'master': {'$ref': '#/definitions/HAMember'},
+                                                            'rs-members': {'items': {'$ref': '#/definitions/Member'},
+                                                                           'type': 'array'}},
+                                             'required': ['rs-members',
+                                                          'master',
+                                                          'ha-members'],
                                              'type': 'object'},
+                     'MongoVersion': {'additionalProperties': False,
+                                      'properties': {'engine': {'type': 'string'},
+                                                     'major': {'type': 'integer'},
+                                                     'minor': {'type': 'integer'},
+                                                     'patch': {'type': 'string'}},
+                                      'required': ['major',
+                                                   'minor',
+                                                   'patch',
+                                                   'engine'],
+                                      'type': 'object'},
                      'ResumeReplicationParams': {'additionalProperties': False,
-                                                 'properties': {'Members': {'items': {'$ref': '#/definitions/Member'},
+                                                 'properties': {'members': {'items': {'$ref': '#/definitions/Member'},
                                                                             'type': 'array'}},
-                                                 'required': ['Members'],
+                                                 'required': ['members'],
                                                  'type': 'object'},
                      'UpgradeMongoParams': {'additionalProperties': False,
-                                            'properties': {'Target': {'$ref': '#/definitions/Version'}},
-                                            'required': ['Target'],
+                                            'properties': {'target': {'$ref': '#/definitions/MongoVersion'}},
+                                            'required': ['target'],
                                             'type': 'object'},
                      'Value': {'additionalProperties': False,
                                'properties': {'arch': {'type': 'string'},
                                               'container': {'type': 'string'},
-                                              'cpu-cores': {'type': 'integer'},
+                                              'cores': {'type': 'integer'},
                                               'cpu-power': {'type': 'integer'},
                                               'instance-type': {'type': 'string'},
                                               'mem': {'type': 'integer'},
@@ -10506,31 +11764,7 @@ class HighAvailabilityFacade(Type):
                                               'tags': {'items': {'type': 'string'},
                                                        'type': 'array'},
                                               'virt-type': {'type': 'string'}},
-                               'type': 'object'},
-                     'Version': {'additionalProperties': False,
-                                 'properties': {'Major': {'type': 'integer'},
-                                                'Minor': {'type': 'integer'},
-                                                'Patch': {'type': 'string'},
-                                                'StorageEngine': {'type': 'string'}},
-                                 'required': ['Major',
-                                              'Minor',
-                                              'Patch',
-                                              'StorageEngine'],
-                                 'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                               'type': 'object'}},
      'properties': {'EnableHA': {'properties': {'Params': {'$ref': '#/definitions/ControllersSpecs'},
                                                 'Result': {'$ref': '#/definitions/ControllersChangeResults'}},
                                  'type': 'object'},
@@ -10545,13 +11779,13 @@ class HighAvailabilityFacade(Type):
     @ReturnMapping(ControllersChangeResults)
     async def EnableHA(self, specs):
         '''
-        specs : typing.Sequence[~ControllersSpec]
-        Returns -> typing.Sequence[~ControllersChangeResult]
+        specs : typing.Sequence<+T_co>[~ControllersSpec]<~ControllersSpec>
+        Returns -> typing.Sequence<+T_co>[~ControllersChangeResult]<~ControllersChangeResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='HighAvailability', Request='EnableHA', Version=2, Params=params)
-        params['Specs'] = specs
+        _params = dict()
+        msg = dict(type='HighAvailability', request='EnableHA', version=2, params=_params)
+        _params['specs'] = specs
         reply = await self.rpc(msg)
         return reply
 
@@ -10560,34 +11794,28 @@ class HighAvailabilityFacade(Type):
     @ReturnMapping(None)
     async def ResumeHAReplicationAfterUpgrade(self, members):
         '''
-        members : typing.Sequence[~Member]
+        members : typing.Sequence<+T_co>[~Member]<~Member>
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='HighAvailability', Request='ResumeHAReplicationAfterUpgrade', Version=2, Params=params)
-        params['Members'] = members
+        _params = dict()
+        msg = dict(type='HighAvailability', request='ResumeHAReplicationAfterUpgrade', version=2, params=_params)
+        _params['members'] = members
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(MongoUpgradeResults)
-    async def StopHAReplicationForUpgrade(self, major, minor, patch, storageengine):
+    async def StopHAReplicationForUpgrade(self, target):
         '''
-        major : int
-        minor : int
-        patch : str
-        storageengine : str
-        Returns -> typing.Union[_ForwardRef('HAMember'), typing.Sequence[~Member]]
+        target : MongoVersion
+        Returns -> typing.Union[_ForwardRef('HAMember'), typing.Sequence<+T_co>[~Member]<~Member>]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='HighAvailability', Request='StopHAReplicationForUpgrade', Version=2, Params=params)
-        params['Major'] = major
-        params['Minor'] = minor
-        params['Patch'] = patch
-        params['StorageEngine'] = storageengine
+        _params = dict()
+        msg = dict(type='HighAvailability', request='StopHAReplicationForUpgrade', version=2, params=_params)
+        _params['target'] = target
         reply = await self.rpc(msg)
         return reply
 
@@ -10596,39 +11824,24 @@ class HostKeyReporterFacade(Type):
     name = 'HostKeyReporter'
     version = 1
     schema =     {'definitions': {'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'SSHHostKeySet': {'additionalProperties': False,
                                        'properties': {'entity-keys': {'items': {'$ref': '#/definitions/SSHHostKeys'},
                                                                       'type': 'array'}},
@@ -10639,21 +11852,7 @@ class HostKeyReporterFacade(Type):
                                                                     'type': 'array'},
                                                     'tag': {'type': 'string'}},
                                      'required': ['tag', 'public-keys'],
-                                     'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                     'type': 'object'}},
      'properties': {'ReportKeys': {'properties': {'Params': {'$ref': '#/definitions/SSHHostKeySet'},
                                                   'Result': {'$ref': '#/definitions/ErrorResults'}},
                                    'type': 'object'}},
@@ -10663,13 +11862,13 @@ class HostKeyReporterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def ReportKeys(self, entity_keys):
         '''
-        entity_keys : typing.Sequence[~SSHHostKeys]
-        Returns -> typing.Sequence[~ErrorResult]
+        entity_keys : typing.Sequence<+T_co>[~SSHHostKeys]<~SSHHostKeys>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='HostKeyReporter', Request='ReportKeys', Version=1, Params=params)
-        params['entity-keys'] = entity_keys
+        _params = dict()
+        msg = dict(type='HostKeyReporter', request='ReportKeys', version=1, params=_params)
+        _params['entity-keys'] = entity_keys
         reply = await self.rpc(msg)
         return reply
 
@@ -10678,23 +11877,22 @@ class ImageManagerFacade(Type):
     name = 'ImageManager'
     version = 2
     schema =     {'definitions': {'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'ImageFilterParams': {'additionalProperties': False,
                                            'properties': {'images': {'items': {'$ref': '#/definitions/ImageSpec'},
@@ -10725,35 +11923,7 @@ class ImageManagerFacade(Type):
                                                                    'type': 'array'}},
                                          'required': ['result'],
                                          'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'}},
      'properties': {'DeleteImages': {'properties': {'Params': {'$ref': '#/definitions/ImageFilterParams'},
                                                     'Result': {'$ref': '#/definitions/ErrorResults'}},
                                      'type': 'object'},
@@ -10766,13 +11936,13 @@ class ImageManagerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def DeleteImages(self, images):
         '''
-        images : typing.Sequence[~ImageSpec]
-        Returns -> typing.Sequence[~ErrorResult]
+        images : typing.Sequence<+T_co>[~ImageSpec]<~ImageSpec>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='ImageManager', Request='DeleteImages', Version=2, Params=params)
-        params['images'] = images
+        _params = dict()
+        msg = dict(type='ImageManager', request='DeleteImages', version=2, params=_params)
+        _params['images'] = images
         reply = await self.rpc(msg)
         return reply
 
@@ -10781,13 +11951,13 @@ class ImageManagerFacade(Type):
     @ReturnMapping(ListImageResult)
     async def ListImages(self, images):
         '''
-        images : typing.Sequence[~ImageSpec]
-        Returns -> typing.Sequence[~ImageMetadata]
+        images : typing.Sequence<+T_co>[~ImageSpec]<~ImageSpec>
+        Returns -> typing.Sequence<+T_co>[~ImageMetadata]<~ImageMetadata>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='ImageManager', Request='ListImages', Version=2, Params=params)
-        params['images'] = images
+        _params = dict()
+        msg = dict(type='ImageManager', request='ListImages', version=2, params=_params)
+        _params['images'] = images
         reply = await self.rpc(msg)
         return reply
 
@@ -10797,17 +11967,17 @@ class ImageMetadataFacade(Type):
     version = 2
     schema =     {'definitions': {'CloudImageMetadata': {'additionalProperties': False,
                                             'properties': {'arch': {'type': 'string'},
-                                                           'image_id': {'type': 'string'},
+                                                           'image-id': {'type': 'string'},
                                                            'priority': {'type': 'integer'},
                                                            'region': {'type': 'string'},
-                                                           'root_storage_size': {'type': 'integer'},
-                                                           'root_storage_type': {'type': 'string'},
+                                                           'root-storage-size': {'type': 'integer'},
+                                                           'root-storage-type': {'type': 'string'},
                                                            'series': {'type': 'string'},
                                                            'source': {'type': 'string'},
                                                            'stream': {'type': 'string'},
                                                            'version': {'type': 'string'},
-                                                           'virt_type': {'type': 'string'}},
-                                            'required': ['image_id',
+                                                           'virt-type': {'type': 'string'}},
+                                            'required': ['image-id',
                                                          'region',
                                                          'version',
                                                          'series',
@@ -10820,23 +11990,22 @@ class ImageMetadataFacade(Type):
                                                                             'type': 'array'}},
                                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'ImageMetadataFilter': {'additionalProperties': False,
                                              'properties': {'arches': {'items': {'type': 'string'},
@@ -10846,51 +12015,23 @@ class ImageMetadataFacade(Type):
                                                             'series': {'items': {'type': 'string'},
                                                                        'type': 'array'},
                                                             'stream': {'type': 'string'},
-                                                            'virt_type': {'type': 'string'}},
+                                                            'virt-type': {'type': 'string'}},
                                              'type': 'object'},
                      'ListCloudImageMetadataResult': {'additionalProperties': False,
                                                       'properties': {'result': {'items': {'$ref': '#/definitions/CloudImageMetadata'},
                                                                                 'type': 'array'}},
                                                       'required': ['result'],
                                                       'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'MetadataImageIds': {'additionalProperties': False,
-                                          'properties': {'image_ids': {'items': {'type': 'string'},
+                                          'properties': {'image-ids': {'items': {'type': 'string'},
                                                                        'type': 'array'}},
-                                          'required': ['image_ids'],
+                                          'required': ['image-ids'],
                                           'type': 'object'},
                      'MetadataSaveParams': {'additionalProperties': False,
                                             'properties': {'metadata': {'items': {'$ref': '#/definitions/CloudImageMetadataList'},
                                                                         'type': 'array'}},
-                                            'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                            'type': 'object'}},
      'properties': {'Delete': {'properties': {'Params': {'$ref': '#/definitions/MetadataImageIds'},
                                               'Result': {'$ref': '#/definitions/ErrorResults'}},
                                'type': 'object'},
@@ -10907,13 +12048,13 @@ class ImageMetadataFacade(Type):
     @ReturnMapping(ErrorResults)
     async def Delete(self, image_ids):
         '''
-        image_ids : typing.Sequence[str]
-        Returns -> typing.Sequence[~ErrorResult]
+        image_ids : typing.Sequence<+T_co>[str]
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='ImageMetadata', Request='Delete', Version=2, Params=params)
-        params['image_ids'] = image_ids
+        _params = dict()
+        msg = dict(type='ImageMetadata', request='Delete', version=2, params=_params)
+        _params['image-ids'] = image_ids
         reply = await self.rpc(msg)
         return reply
 
@@ -10922,23 +12063,23 @@ class ImageMetadataFacade(Type):
     @ReturnMapping(ListCloudImageMetadataResult)
     async def List(self, arches, region, root_storage_type, series, stream, virt_type):
         '''
-        arches : typing.Sequence[str]
+        arches : typing.Sequence<+T_co>[str]
         region : str
         root_storage_type : str
-        series : typing.Sequence[str]
+        series : typing.Sequence<+T_co>[str]
         stream : str
         virt_type : str
-        Returns -> typing.Sequence[~CloudImageMetadata]
+        Returns -> typing.Sequence<+T_co>[~CloudImageMetadata]<~CloudImageMetadata>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='ImageMetadata', Request='List', Version=2, Params=params)
-        params['arches'] = arches
-        params['region'] = region
-        params['root-storage-type'] = root_storage_type
-        params['series'] = series
-        params['stream'] = stream
-        params['virt_type'] = virt_type
+        _params = dict()
+        msg = dict(type='ImageMetadata', request='List', version=2, params=_params)
+        _params['arches'] = arches
+        _params['region'] = region
+        _params['root-storage-type'] = root_storage_type
+        _params['series'] = series
+        _params['stream'] = stream
+        _params['virt-type'] = virt_type
         reply = await self.rpc(msg)
         return reply
 
@@ -10947,13 +12088,13 @@ class ImageMetadataFacade(Type):
     @ReturnMapping(ErrorResults)
     async def Save(self, metadata):
         '''
-        metadata : typing.Sequence[~CloudImageMetadataList]
-        Returns -> typing.Sequence[~ErrorResult]
+        metadata : typing.Sequence<+T_co>[~CloudImageMetadataList]<~CloudImageMetadataList>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='ImageMetadata', Request='Save', Version=2, Params=params)
-        params['metadata'] = metadata
+        _params = dict()
+        msg = dict(type='ImageMetadata', request='Save', version=2, params=_params)
+        _params['metadata'] = metadata
         reply = await self.rpc(msg)
         return reply
 
@@ -10966,8 +12107,8 @@ class ImageMetadataFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='ImageMetadata', Request='UpdateFromPublishedImages', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='ImageMetadata', request='UpdateFromPublishedImages', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -10977,182 +12118,150 @@ class InstancePollerFacade(Type):
     name = 'InstancePoller'
     version = 3
     schema =     {'definitions': {'Address': {'additionalProperties': False,
-                                 'properties': {'Scope': {'type': 'string'},
-                                                'SpaceName': {'type': 'string'},
-                                                'Type': {'type': 'string'},
-                                                'Value': {'type': 'string'}},
-                                 'required': ['Value', 'Type', 'Scope'],
+                                 'properties': {'scope': {'type': 'string'},
+                                                'space-name': {'type': 'string'},
+                                                'type': {'type': 'string'},
+                                                'value': {'type': 'string'}},
+                                 'required': ['value', 'type', 'scope'],
                                  'type': 'object'},
                      'BoolResult': {'additionalProperties': False,
-                                    'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                   'Result': {'type': 'boolean'}},
-                                    'required': ['Error', 'Result'],
+                                    'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                   'result': {'type': 'boolean'}},
+                                    'required': ['result'],
                                     'type': 'object'},
                      'BoolResults': {'additionalProperties': False,
-                                     'properties': {'Results': {'items': {'$ref': '#/definitions/BoolResult'},
+                                     'properties': {'results': {'items': {'$ref': '#/definitions/BoolResult'},
                                                                 'type': 'array'}},
-                                     'required': ['Results'],
+                                     'required': ['results'],
                                      'type': 'object'},
                      'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'EntityStatusArgs': {'additionalProperties': False,
-                                          'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True,
+                                          'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                'type': 'object'}},
                                                                   'type': 'object'},
-                                                         'Info': {'type': 'string'},
-                                                         'Status': {'type': 'string'},
-                                                         'Tag': {'type': 'string'}},
-                                          'required': ['Tag',
-                                                       'Status',
-                                                       'Info',
-                                                       'Data'],
+                                                         'info': {'type': 'string'},
+                                                         'status': {'type': 'string'},
+                                                         'tag': {'type': 'string'}},
+                                          'required': ['tag',
+                                                       'status',
+                                                       'info',
+                                                       'data'],
                                           'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'LifeResult': {'additionalProperties': False,
-                                    'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                   'Life': {'type': 'string'}},
-                                    'required': ['Life', 'Error'],
+                                    'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                   'life': {'type': 'string'}},
+                                    'required': ['life'],
                                     'type': 'object'},
                      'LifeResults': {'additionalProperties': False,
-                                     'properties': {'Results': {'items': {'$ref': '#/definitions/LifeResult'},
+                                     'properties': {'results': {'items': {'$ref': '#/definitions/LifeResult'},
                                                                 'type': 'array'}},
-                                     'required': ['Results'],
+                                     'required': ['results'],
                                      'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'MachineAddresses': {'additionalProperties': False,
-                                          'properties': {'Addresses': {'items': {'$ref': '#/definitions/Address'},
+                                          'properties': {'addresses': {'items': {'$ref': '#/definitions/Address'},
                                                                        'type': 'array'},
-                                                         'Tag': {'type': 'string'}},
-                                          'required': ['Tag', 'Addresses'],
+                                                         'tag': {'type': 'string'}},
+                                          'required': ['tag', 'addresses'],
                                           'type': 'object'},
                      'MachineAddressesResult': {'additionalProperties': False,
-                                                'properties': {'Addresses': {'items': {'$ref': '#/definitions/Address'},
+                                                'properties': {'addresses': {'items': {'$ref': '#/definitions/Address'},
                                                                              'type': 'array'},
-                                                               'Error': {'$ref': '#/definitions/Error'}},
-                                                'required': ['Error', 'Addresses'],
+                                                               'error': {'$ref': '#/definitions/Error'}},
+                                                'required': ['addresses'],
                                                 'type': 'object'},
                      'MachineAddressesResults': {'additionalProperties': False,
-                                                 'properties': {'Results': {'items': {'$ref': '#/definitions/MachineAddressesResult'},
+                                                 'properties': {'results': {'items': {'$ref': '#/definitions/MachineAddressesResult'},
                                                                             'type': 'array'}},
-                                                 'required': ['Results'],
+                                                 'required': ['results'],
                                                  'type': 'object'},
                      'ModelConfigResult': {'additionalProperties': False,
-                                           'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                           'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                   'type': 'object'}},
                                                                      'type': 'object'}},
-                                           'required': ['Config'],
+                                           'required': ['config'],
                                            'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
                      'SetMachinesAddresses': {'additionalProperties': False,
-                                              'properties': {'MachineAddresses': {'items': {'$ref': '#/definitions/MachineAddresses'},
-                                                                                  'type': 'array'}},
-                                              'required': ['MachineAddresses'],
+                                              'properties': {'machine-addresses': {'items': {'$ref': '#/definitions/MachineAddresses'},
+                                                                                   'type': 'array'}},
+                                              'required': ['machine-addresses'],
                                               'type': 'object'},
                      'SetStatus': {'additionalProperties': False,
-                                   'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'},
+                                   'properties': {'entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'},
                                                                'type': 'array'}},
-                                   'required': ['Entities'],
+                                   'required': ['entities'],
                                    'type': 'object'},
                      'StatusResult': {'additionalProperties': False,
-                                      'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True,
+                                      'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                            'type': 'object'}},
                                                               'type': 'object'},
-                                                     'Error': {'$ref': '#/definitions/Error'},
-                                                     'Id': {'type': 'string'},
-                                                     'Info': {'type': 'string'},
-                                                     'Life': {'type': 'string'},
-                                                     'Since': {'format': 'date-time',
+                                                     'error': {'$ref': '#/definitions/Error'},
+                                                     'id': {'type': 'string'},
+                                                     'info': {'type': 'string'},
+                                                     'life': {'type': 'string'},
+                                                     'since': {'format': 'date-time',
                                                                'type': 'string'},
-                                                     'Status': {'type': 'string'}},
-                                      'required': ['Error',
-                                                   'Id',
-                                                   'Life',
-                                                   'Status',
-                                                   'Info',
-                                                   'Data',
-                                                   'Since'],
+                                                     'status': {'type': 'string'}},
+                                      'required': ['id',
+                                                   'life',
+                                                   'status',
+                                                   'info',
+                                                   'data',
+                                                   'since'],
                                       'type': 'object'},
                      'StatusResults': {'additionalProperties': False,
-                                       'properties': {'Results': {'items': {'$ref': '#/definitions/StatusResult'},
+                                       'properties': {'results': {'items': {'$ref': '#/definitions/StatusResult'},
                                                                   'type': 'array'}},
-                                       'required': ['Results'],
+                                       'required': ['results'],
                                        'type': 'object'},
                      'StringResult': {'additionalProperties': False,
-                                      'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                     'Result': {'type': 'string'}},
-                                      'required': ['Error', 'Result'],
+                                      'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                     'result': {'type': 'string'}},
+                                      'required': ['result'],
                                       'type': 'object'},
                      'StringResults': {'additionalProperties': False,
-                                       'properties': {'Results': {'items': {'$ref': '#/definitions/StringResult'},
+                                       'properties': {'results': {'items': {'$ref': '#/definitions/StringResult'},
                                                                   'type': 'array'}},
-                                       'required': ['Results'],
+                                       'required': ['results'],
                                        'type': 'object'},
                      'StringsWatchResult': {'additionalProperties': False,
-                                            'properties': {'Changes': {'items': {'type': 'string'},
+                                            'properties': {'changes': {'items': {'type': 'string'},
                                                                        'type': 'array'},
-                                                           'Error': {'$ref': '#/definitions/Error'},
-                                                           'StringsWatcherId': {'type': 'string'}},
-                                            'required': ['StringsWatcherId',
-                                                         'Changes',
-                                                         'Error'],
-                                            'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                                           'error': {'$ref': '#/definitions/Error'},
+                                                           'watcher-id': {'type': 'string'}},
+                                            'required': ['watcher-id'],
+                                            'type': 'object'}},
      'properties': {'AreManuallyProvisioned': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                               'Result': {'$ref': '#/definitions/BoolResults'}},
                                                'type': 'object'},
@@ -11189,13 +12298,13 @@ class InstancePollerFacade(Type):
     @ReturnMapping(BoolResults)
     async def AreManuallyProvisioned(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~BoolResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~BoolResult]<~BoolResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='InstancePoller', Request='AreManuallyProvisioned', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='InstancePoller', request='AreManuallyProvisioned', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -11204,13 +12313,13 @@ class InstancePollerFacade(Type):
     @ReturnMapping(StringResults)
     async def InstanceId(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringResult]<~StringResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='InstancePoller', Request='InstanceId', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='InstancePoller', request='InstanceId', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -11219,13 +12328,13 @@ class InstancePollerFacade(Type):
     @ReturnMapping(StatusResults)
     async def InstanceStatus(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StatusResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StatusResult]<~StatusResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='InstancePoller', Request='InstanceStatus', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='InstancePoller', request='InstanceStatus', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -11234,13 +12343,13 @@ class InstancePollerFacade(Type):
     @ReturnMapping(LifeResults)
     async def Life(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~LifeResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~LifeResult]<~LifeResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='InstancePoller', Request='Life', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='InstancePoller', request='Life', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -11250,11 +12359,11 @@ class InstancePollerFacade(Type):
     async def ModelConfig(self):
         '''
 
-        Returns -> typing.Mapping[str, typing.Any]
+        Returns -> typing.Mapping<~KT, +VT_co>[str, typing.Any]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='InstancePoller', Request='ModelConfig', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='InstancePoller', request='ModelConfig', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -11264,13 +12373,13 @@ class InstancePollerFacade(Type):
     @ReturnMapping(MachineAddressesResults)
     async def ProviderAddresses(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~MachineAddressesResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~MachineAddressesResult]<~MachineAddressesResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='InstancePoller', Request='ProviderAddresses', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='InstancePoller', request='ProviderAddresses', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -11279,28 +12388,28 @@ class InstancePollerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetInstanceStatus(self, entities):
         '''
-        entities : typing.Sequence[~EntityStatusArgs]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='InstancePoller', Request='SetInstanceStatus', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='InstancePoller', request='SetInstanceStatus', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(ErrorResults)
-    async def SetProviderAddresses(self, machineaddresses):
+    async def SetProviderAddresses(self, machine_addresses):
         '''
-        machineaddresses : typing.Sequence[~MachineAddresses]
-        Returns -> typing.Sequence[~ErrorResult]
+        machine_addresses : typing.Sequence<+T_co>[~MachineAddresses]<~MachineAddresses>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='InstancePoller', Request='SetProviderAddresses', Version=3, Params=params)
-        params['MachineAddresses'] = machineaddresses
+        _params = dict()
+        msg = dict(type='InstancePoller', request='SetProviderAddresses', version=3, params=_params)
+        _params['machine-addresses'] = machine_addresses
         reply = await self.rpc(msg)
         return reply
 
@@ -11309,13 +12418,13 @@ class InstancePollerFacade(Type):
     @ReturnMapping(StatusResults)
     async def Status(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StatusResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StatusResult]<~StatusResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='InstancePoller', Request='Status', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='InstancePoller', request='Status', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -11325,11 +12434,11 @@ class InstancePollerFacade(Type):
     async def WatchForModelConfigChanges(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), str]
+        Returns -> typing.Union[str, _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='InstancePoller', Request='WatchForModelConfigChanges', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='InstancePoller', request='WatchForModelConfigChanges', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -11340,11 +12449,11 @@ class InstancePollerFacade(Type):
     async def WatchModelMachines(self):
         '''
 
-        Returns -> typing.Union[typing.Sequence[str], _ForwardRef('Error')]
+        Returns -> typing.Union[typing.Sequence<+T_co>[str], _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='InstancePoller', Request='WatchModelMachines', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='InstancePoller', request='WatchModelMachines', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -11354,84 +12463,54 @@ class KeyManagerFacade(Type):
     name = 'KeyManager'
     version = 1
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'ListSSHKeys': {'additionalProperties': False,
-                                     'properties': {'Entities': {'$ref': '#/definitions/Entities'},
-                                                    'Mode': {'type': 'boolean'}},
-                                     'required': ['Entities', 'Mode'],
+                                     'properties': {'entities': {'$ref': '#/definitions/Entities'},
+                                                    'mode': {'type': 'boolean'}},
+                                     'required': ['entities', 'mode'],
                                      'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'ModifyUserSSHKeys': {'additionalProperties': False,
-                                           'properties': {'Keys': {'items': {'type': 'string'},
-                                                                   'type': 'array'},
-                                                          'User': {'type': 'string'}},
-                                           'required': ['User', 'Keys'],
+                                           'properties': {'ssh-keys': {'items': {'type': 'string'},
+                                                                       'type': 'array'},
+                                                          'user': {'type': 'string'}},
+                                           'required': ['user', 'ssh-keys'],
                                            'type': 'object'},
                      'StringsResult': {'additionalProperties': False,
-                                       'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                      'Result': {'items': {'type': 'string'},
+                                       'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                      'result': {'items': {'type': 'string'},
                                                                  'type': 'array'}},
-                                       'required': ['Error', 'Result'],
                                        'type': 'object'},
                      'StringsResults': {'additionalProperties': False,
-                                        'properties': {'Results': {'items': {'$ref': '#/definitions/StringsResult'},
+                                        'properties': {'results': {'items': {'$ref': '#/definitions/StringsResult'},
                                                                    'type': 'array'}},
-                                        'required': ['Results'],
-                                        'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                        'required': ['results'],
+                                        'type': 'object'}},
      'properties': {'AddKeys': {'properties': {'Params': {'$ref': '#/definitions/ModifyUserSSHKeys'},
                                                'Result': {'$ref': '#/definitions/ErrorResults'}},
                                 'type': 'object'},
@@ -11448,51 +12527,51 @@ class KeyManagerFacade(Type):
     
 
     @ReturnMapping(ErrorResults)
-    async def AddKeys(self, keys, user):
+    async def AddKeys(self, ssh_keys, user):
         '''
-        keys : typing.Sequence[str]
+        ssh_keys : typing.Sequence<+T_co>[str]
         user : str
-        Returns -> typing.Sequence[~ErrorResult]
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='KeyManager', Request='AddKeys', Version=1, Params=params)
-        params['Keys'] = keys
-        params['User'] = user
+        _params = dict()
+        msg = dict(type='KeyManager', request='AddKeys', version=1, params=_params)
+        _params['ssh-keys'] = ssh_keys
+        _params['user'] = user
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(ErrorResults)
-    async def DeleteKeys(self, keys, user):
+    async def DeleteKeys(self, ssh_keys, user):
         '''
-        keys : typing.Sequence[str]
+        ssh_keys : typing.Sequence<+T_co>[str]
         user : str
-        Returns -> typing.Sequence[~ErrorResult]
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='KeyManager', Request='DeleteKeys', Version=1, Params=params)
-        params['Keys'] = keys
-        params['User'] = user
+        _params = dict()
+        msg = dict(type='KeyManager', request='DeleteKeys', version=1, params=_params)
+        _params['ssh-keys'] = ssh_keys
+        _params['user'] = user
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(ErrorResults)
-    async def ImportKeys(self, keys, user):
+    async def ImportKeys(self, ssh_keys, user):
         '''
-        keys : typing.Sequence[str]
+        ssh_keys : typing.Sequence<+T_co>[str]
         user : str
-        Returns -> typing.Sequence[~ErrorResult]
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='KeyManager', Request='ImportKeys', Version=1, Params=params)
-        params['Keys'] = keys
-        params['User'] = user
+        _params = dict()
+        msg = dict(type='KeyManager', request='ImportKeys', version=1, params=_params)
+        _params['ssh-keys'] = ssh_keys
+        _params['user'] = user
         reply = await self.rpc(msg)
         return reply
 
@@ -11503,13 +12582,13 @@ class KeyManagerFacade(Type):
         '''
         entities : Entities
         mode : bool
-        Returns -> typing.Sequence[~StringsResult]
+        Returns -> typing.Sequence<+T_co>[~StringsResult]<~StringsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='KeyManager', Request='ListKeys', Version=1, Params=params)
-        params['Entities'] = entities
-        params['Mode'] = mode
+        _params = dict()
+        msg = dict(type='KeyManager', request='ListKeys', version=1, params=_params)
+        _params['entities'] = entities
+        _params['mode'] = mode
         reply = await self.rpc(msg)
         return reply
 
@@ -11518,74 +12597,45 @@ class KeyUpdaterFacade(Type):
     name = 'KeyUpdater'
     version = 1
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
                      'NotifyWatchResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
+                                            'required': ['results'],
                                             'type': 'object'},
                      'StringsResult': {'additionalProperties': False,
-                                       'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                      'Result': {'items': {'type': 'string'},
+                                       'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                      'result': {'items': {'type': 'string'},
                                                                  'type': 'array'}},
-                                       'required': ['Error', 'Result'],
                                        'type': 'object'},
                      'StringsResults': {'additionalProperties': False,
-                                        'properties': {'Results': {'items': {'$ref': '#/definitions/StringsResult'},
+                                        'properties': {'results': {'items': {'$ref': '#/definitions/StringsResult'},
                                                                    'type': 'array'}},
-                                        'required': ['Results'],
-                                        'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                        'required': ['results'],
+                                        'type': 'object'}},
      'properties': {'AuthorisedKeys': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                       'Result': {'$ref': '#/definitions/StringsResults'}},
                                        'type': 'object'},
@@ -11598,13 +12648,13 @@ class KeyUpdaterFacade(Type):
     @ReturnMapping(StringsResults)
     async def AuthorisedKeys(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringsResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringsResult]<~StringsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='KeyUpdater', Request='AuthorisedKeys', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='KeyUpdater', request='AuthorisedKeys', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -11613,13 +12663,13 @@ class KeyUpdaterFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def WatchAuthorisedKeys(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='KeyUpdater', Request='WatchAuthorisedKeys', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='KeyUpdater', request='WatchAuthorisedKeys', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -11632,66 +12682,37 @@ class LeadershipServiceFacade(Type):
                                         'required': ['Name'],
                                         'type': 'object'},
                      'ClaimLeadershipBulkParams': {'additionalProperties': False,
-                                                   'properties': {'Params': {'items': {'$ref': '#/definitions/ClaimLeadershipParams'},
+                                                   'properties': {'params': {'items': {'$ref': '#/definitions/ClaimLeadershipParams'},
                                                                              'type': 'array'}},
-                                                   'required': ['Params'],
+                                                   'required': ['params'],
                                                    'type': 'object'},
                      'ClaimLeadershipBulkResults': {'additionalProperties': False,
-                                                    'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                                    'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                                'type': 'array'}},
-                                                    'required': ['Results'],
+                                                    'required': ['results'],
                                                     'type': 'object'},
                      'ClaimLeadershipParams': {'additionalProperties': False,
-                                               'properties': {'ApplicationTag': {'type': 'string'},
-                                                              'DurationSeconds': {'type': 'number'},
-                                                              'UnitTag': {'type': 'string'}},
-                                               'required': ['ApplicationTag',
-                                                            'UnitTag',
-                                                            'DurationSeconds'],
+                                               'properties': {'application-tag': {'type': 'string'},
+                                                              'duration': {'type': 'number'},
+                                                              'unit-tag': {'type': 'string'}},
+                                               'required': ['application-tag',
+                                                            'unit-tag',
+                                                            'duration'],
                                                'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'}},
      'properties': {'BlockUntilLeadershipReleased': {'properties': {'Params': {'$ref': '#/definitions/ApplicationTag'},
                                                                     'Result': {'$ref': '#/definitions/ErrorResult'}},
                                                      'type': 'object'},
@@ -11708,9 +12729,9 @@ class LeadershipServiceFacade(Type):
         Returns -> Error
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='LeadershipService', Request='BlockUntilLeadershipReleased', Version=2, Params=params)
-        params['Name'] = name
+        _params = dict()
+        msg = dict(type='LeadershipService', request='BlockUntilLeadershipReleased', version=2, params=_params)
+        _params['Name'] = name
         reply = await self.rpc(msg)
         return reply
 
@@ -11719,13 +12740,13 @@ class LeadershipServiceFacade(Type):
     @ReturnMapping(ClaimLeadershipBulkResults)
     async def ClaimLeadership(self, params):
         '''
-        params : typing.Sequence[~ClaimLeadershipParams]
-        Returns -> typing.Sequence[~ErrorResult]
+        params : typing.Sequence<+T_co>[~ClaimLeadershipParams]<~ClaimLeadershipParams>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='LeadershipService', Request='ClaimLeadership', Version=2, Params=params)
-        params['Params'] = params
+        _params = dict()
+        msg = dict(type='LeadershipService', request='ClaimLeadership', version=2, params=_params)
+        _params['params'] = params
         reply = await self.rpc(msg)
         return reply
 
@@ -11734,73 +12755,45 @@ class LifeFlagFacade(Type):
     name = 'LifeFlag'
     version = 1
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'LifeResult': {'additionalProperties': False,
-                                    'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                   'Life': {'type': 'string'}},
-                                    'required': ['Life', 'Error'],
+                                    'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                   'life': {'type': 'string'}},
+                                    'required': ['life'],
                                     'type': 'object'},
                      'LifeResults': {'additionalProperties': False,
-                                     'properties': {'Results': {'items': {'$ref': '#/definitions/LifeResult'},
+                                     'properties': {'results': {'items': {'$ref': '#/definitions/LifeResult'},
                                                                 'type': 'array'}},
-                                     'required': ['Results'],
+                                     'required': ['results'],
                                      'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
                      'NotifyWatchResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
-                                            'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                            'required': ['results'],
+                                            'type': 'object'}},
      'properties': {'Life': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                             'Result': {'$ref': '#/definitions/LifeResults'}},
                              'type': 'object'},
@@ -11813,13 +12806,13 @@ class LifeFlagFacade(Type):
     @ReturnMapping(LifeResults)
     async def Life(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~LifeResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~LifeResult]<~LifeResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='LifeFlag', Request='Life', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='LifeFlag', request='Life', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -11828,13 +12821,109 @@ class LifeFlagFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def Watch(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='LifeFlag', request='Watch', version=1, params=_params)
+        _params['entities'] = entities
+        reply = await self.rpc(msg)
+        return reply
+
+
+class LogForwardingFacade(Type):
+    name = 'LogForwarding'
+    version = 1
+    schema =     {'definitions': {'Error': {'additionalProperties': False,
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
+                               'type': 'object'},
+                     'ErrorInfo': {'additionalProperties': False,
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
+                                   'type': 'object'},
+                     'ErrorResult': {'additionalProperties': False,
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
+                                     'type': 'object'},
+                     'ErrorResults': {'additionalProperties': False,
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                                                 'type': 'array'}},
+                                      'required': ['results'],
+                                      'type': 'object'},
+                     'LogForwardingGetLastSentParams': {'additionalProperties': False,
+                                                        'properties': {'ids': {'items': {'$ref': '#/definitions/LogForwardingID'},
+                                                                               'type': 'array'}},
+                                                        'required': ['ids'],
+                                                        'type': 'object'},
+                     'LogForwardingGetLastSentResult': {'additionalProperties': False,
+                                                        'properties': {'err': {'$ref': '#/definitions/Error'},
+                                                                       'record-id': {'type': 'integer'},
+                                                                       'record-timestamp': {'type': 'integer'}},
+                                                        'required': ['record-id',
+                                                                     'record-timestamp',
+                                                                     'err'],
+                                                        'type': 'object'},
+                     'LogForwardingGetLastSentResults': {'additionalProperties': False,
+                                                         'properties': {'results': {'items': {'$ref': '#/definitions/LogForwardingGetLastSentResult'},
+                                                                                    'type': 'array'}},
+                                                         'required': ['results'],
+                                                         'type': 'object'},
+                     'LogForwardingID': {'additionalProperties': False,
+                                         'properties': {'model': {'type': 'string'},
+                                                        'sink': {'type': 'string'}},
+                                         'required': ['model', 'sink'],
+                                         'type': 'object'},
+                     'LogForwardingSetLastSentParam': {'additionalProperties': False,
+                                                       'properties': {'LogForwardingID': {'$ref': '#/definitions/LogForwardingID'},
+                                                                      'record-id': {'type': 'integer'},
+                                                                      'record-timestamp': {'type': 'integer'}},
+                                                       'required': ['LogForwardingID',
+                                                                    'record-id',
+                                                                    'record-timestamp'],
+                                                       'type': 'object'},
+                     'LogForwardingSetLastSentParams': {'additionalProperties': False,
+                                                        'properties': {'params': {'items': {'$ref': '#/definitions/LogForwardingSetLastSentParam'},
+                                                                                  'type': 'array'}},
+                                                        'required': ['params'],
+                                                        'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'}},
+     'properties': {'GetLastSent': {'properties': {'Params': {'$ref': '#/definitions/LogForwardingGetLastSentParams'},
+                                                   'Result': {'$ref': '#/definitions/LogForwardingGetLastSentResults'}},
+                                    'type': 'object'},
+                    'SetLastSent': {'properties': {'Params': {'$ref': '#/definitions/LogForwardingSetLastSentParams'},
+                                                   'Result': {'$ref': '#/definitions/ErrorResults'}},
+                                    'type': 'object'}},
+     'type': 'object'}
+    
+
+    @ReturnMapping(LogForwardingGetLastSentResults)
+    async def GetLastSent(self, ids):
+        '''
+        ids : typing.Sequence<+T_co>[~LogForwardingID]<~LogForwardingID>
+        Returns -> typing.Sequence<+T_co>[~LogForwardingGetLastSentResult]<~LogForwardingGetLastSentResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='LogForwarding', request='GetLastSent', version=1, params=_params)
+        _params['ids'] = ids
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(ErrorResults)
+    async def SetLastSent(self, params):
+        '''
+        params : typing.Sequence<+T_co>[~LogForwardingSetLastSentParam]<~LogForwardingSetLastSentParam>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='LifeFlag', Request='Watch', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='LogForwarding', request='SetLastSent', version=1, params=_params)
+        _params['params'] = params
         reply = await self.rpc(msg)
         return reply
 
@@ -11843,73 +12932,45 @@ class LoggerFacade(Type):
     name = 'Logger'
     version = 1
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
                      'NotifyWatchResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
+                                            'required': ['results'],
                                             'type': 'object'},
                      'StringResult': {'additionalProperties': False,
-                                      'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                     'Result': {'type': 'string'}},
-                                      'required': ['Error', 'Result'],
+                                      'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                     'result': {'type': 'string'}},
+                                      'required': ['result'],
                                       'type': 'object'},
                      'StringResults': {'additionalProperties': False,
-                                       'properties': {'Results': {'items': {'$ref': '#/definitions/StringResult'},
+                                       'properties': {'results': {'items': {'$ref': '#/definitions/StringResult'},
                                                                   'type': 'array'}},
-                                       'required': ['Results'],
-                                       'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                       'required': ['results'],
+                                       'type': 'object'}},
      'properties': {'LoggingConfig': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                      'Result': {'$ref': '#/definitions/StringResults'}},
                                       'type': 'object'},
@@ -11922,13 +12983,13 @@ class LoggerFacade(Type):
     @ReturnMapping(StringResults)
     async def LoggingConfig(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringResult]<~StringResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Logger', Request='LoggingConfig', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Logger', request='LoggingConfig', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -11937,13 +12998,13 @@ class LoggerFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def WatchLoggingConfig(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Logger', Request='WatchLoggingConfig', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Logger', request='WatchLoggingConfig', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -11961,13 +13022,13 @@ class MachineActionsFacade(Type):
                                 'required': ['tag', 'receiver', 'name'],
                                 'type': 'object'},
                      'ActionExecutionResult': {'additionalProperties': False,
-                                               'properties': {'actiontag': {'type': 'string'},
+                                               'properties': {'action-tag': {'type': 'string'},
                                                               'message': {'type': 'string'},
                                                               'results': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                        'type': 'object'}},
                                                                           'type': 'object'},
                                                               'status': {'type': 'string'}},
-                                               'required': ['actiontag', 'status'],
+                                               'required': ['action-tag', 'status'],
                                                'type': 'object'},
                      'ActionExecutionResults': {'additionalProperties': False,
                                                 'properties': {'results': {'items': {'$ref': '#/definitions/ActionExecutionResult'},
@@ -12003,76 +13064,45 @@ class MachineActionsFacade(Type):
                                                                        'type': 'array'}},
                                             'type': 'object'},
                      'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'StringsWatchResult': {'additionalProperties': False,
-                                            'properties': {'Changes': {'items': {'type': 'string'},
+                                            'properties': {'changes': {'items': {'type': 'string'},
                                                                        'type': 'array'},
-                                                           'Error': {'$ref': '#/definitions/Error'},
-                                                           'StringsWatcherId': {'type': 'string'}},
-                                            'required': ['StringsWatcherId',
-                                                         'Changes',
-                                                         'Error'],
+                                                           'error': {'$ref': '#/definitions/Error'},
+                                                           'watcher-id': {'type': 'string'}},
+                                            'required': ['watcher-id'],
                                             'type': 'object'},
                      'StringsWatchResults': {'additionalProperties': False,
-                                             'properties': {'Results': {'items': {'$ref': '#/definitions/StringsWatchResult'},
+                                             'properties': {'results': {'items': {'$ref': '#/definitions/StringsWatchResult'},
                                                                         'type': 'array'}},
-                                             'required': ['Results'],
-                                             'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                             'required': ['results'],
+                                             'type': 'object'}},
      'properties': {'Actions': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                'Result': {'$ref': '#/definitions/ActionResults'}},
                                 'type': 'object'},
@@ -12094,13 +13124,13 @@ class MachineActionsFacade(Type):
     @ReturnMapping(ActionResults)
     async def Actions(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ActionResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ActionResult]<~ActionResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MachineActions', Request='Actions', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='MachineActions', request='Actions', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -12109,13 +13139,13 @@ class MachineActionsFacade(Type):
     @ReturnMapping(ErrorResults)
     async def BeginActions(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MachineActions', Request='BeginActions', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='MachineActions', request='BeginActions', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -12124,13 +13154,13 @@ class MachineActionsFacade(Type):
     @ReturnMapping(ErrorResults)
     async def FinishActions(self, results):
         '''
-        results : typing.Sequence[~ActionExecutionResult]
-        Returns -> typing.Sequence[~ErrorResult]
+        results : typing.Sequence<+T_co>[~ActionExecutionResult]<~ActionExecutionResult>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MachineActions', Request='FinishActions', Version=1, Params=params)
-        params['results'] = results
+        _params = dict()
+        msg = dict(type='MachineActions', request='FinishActions', version=1, params=_params)
+        _params['results'] = results
         reply = await self.rpc(msg)
         return reply
 
@@ -12139,13 +13169,13 @@ class MachineActionsFacade(Type):
     @ReturnMapping(ActionsByReceivers)
     async def RunningActions(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ActionsByReceiver]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ActionsByReceiver]<~ActionsByReceiver>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MachineActions', Request='RunningActions', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='MachineActions', request='RunningActions', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -12154,13 +13184,13 @@ class MachineActionsFacade(Type):
     @ReturnMapping(StringsWatchResults)
     async def WatchActionNotifications(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringsWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringsWatchResult]<~StringsWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MachineActions', Request='WatchActionNotifications', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='MachineActions', request='WatchActionNotifications', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -12169,53 +13199,51 @@ class MachineManagerFacade(Type):
     name = 'MachineManager'
     version = 2
     schema =     {'definitions': {'AddMachineParams': {'additionalProperties': False,
-                                          'properties': {'Addrs': {'items': {'$ref': '#/definitions/Address'},
-                                                                   'type': 'array'},
-                                                         'Constraints': {'$ref': '#/definitions/Value'},
-                                                         'ContainerType': {'type': 'string'},
-                                                         'Disks': {'items': {'$ref': '#/definitions/Constraints'},
+                                          'properties': {'addresses': {'items': {'$ref': '#/definitions/Address'},
+                                                                       'type': 'array'},
+                                                         'constraints': {'$ref': '#/definitions/Value'},
+                                                         'container-type': {'type': 'string'},
+                                                         'disks': {'items': {'$ref': '#/definitions/Constraints'},
                                                                    'type': 'array'},
-                                                         'HardwareCharacteristics': {'$ref': '#/definitions/HardwareCharacteristics'},
-                                                         'InstanceId': {'type': 'string'},
-                                                         'Jobs': {'items': {'type': 'string'},
+                                                         'hardware-characteristics': {'$ref': '#/definitions/HardwareCharacteristics'},
+                                                         'instance-id': {'type': 'string'},
+                                                         'jobs': {'items': {'type': 'string'},
                                                                   'type': 'array'},
-                                                         'Nonce': {'type': 'string'},
-                                                         'ParentId': {'type': 'string'},
-                                                         'Placement': {'$ref': '#/definitions/Placement'},
-                                                         'Series': {'type': 'string'}},
-                                          'required': ['Series',
-                                                       'Constraints',
-                                                       'Jobs',
-                                                       'Disks',
-                                                       'Placement',
-                                                       'ParentId',
-                                                       'ContainerType',
-                                                       'InstanceId',
-                                                       'Nonce',
-                                                       'HardwareCharacteristics',
-                                                       'Addrs'],
+                                                         'nonce': {'type': 'string'},
+                                                         'parent-id': {'type': 'string'},
+                                                         'placement': {'$ref': '#/definitions/Placement'},
+                                                         'series': {'type': 'string'}},
+                                          'required': ['series',
+                                                       'constraints',
+                                                       'jobs',
+                                                       'parent-id',
+                                                       'container-type',
+                                                       'instance-id',
+                                                       'nonce',
+                                                       'hardware-characteristics',
+                                                       'addresses'],
                                           'type': 'object'},
                      'AddMachines': {'additionalProperties': False,
-                                     'properties': {'MachineParams': {'items': {'$ref': '#/definitions/AddMachineParams'},
-                                                                      'type': 'array'}},
-                                     'required': ['MachineParams'],
+                                     'properties': {'params': {'items': {'$ref': '#/definitions/AddMachineParams'},
+                                                               'type': 'array'}},
+                                     'required': ['params'],
                                      'type': 'object'},
                      'AddMachinesResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'Machine': {'type': 'string'}},
-                                           'required': ['Machine', 'Error'],
+                                           'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                          'machine': {'type': 'string'}},
+                                           'required': ['machine'],
                                            'type': 'object'},
                      'AddMachinesResults': {'additionalProperties': False,
-                                            'properties': {'Machines': {'items': {'$ref': '#/definitions/AddMachinesResult'},
+                                            'properties': {'machines': {'items': {'$ref': '#/definitions/AddMachinesResult'},
                                                                         'type': 'array'}},
-                                            'required': ['Machines'],
+                                            'required': ['machines'],
                                             'type': 'object'},
                      'Address': {'additionalProperties': False,
-                                 'properties': {'Scope': {'type': 'string'},
-                                                'SpaceName': {'type': 'string'},
-                                                'Type': {'type': 'string'},
-                                                'Value': {'type': 'string'}},
-                                 'required': ['Value', 'Type', 'Scope'],
+                                 'properties': {'scope': {'type': 'string'},
+                                                'space-name': {'type': 'string'},
+                                                'type': {'type': 'string'},
+                                                'value': {'type': 'string'}},
+                                 'required': ['value', 'type', 'scope'],
                                  'type': 'object'},
                      'Constraints': {'additionalProperties': False,
                                      'properties': {'Count': {'type': 'integer'},
@@ -12224,49 +13252,35 @@ class MachineManagerFacade(Type):
                                      'required': ['Pool', 'Size', 'Count'],
                                      'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'HardwareCharacteristics': {'additionalProperties': False,
-                                                 'properties': {'Arch': {'type': 'string'},
-                                                                'AvailabilityZone': {'type': 'string'},
-                                                                'CpuCores': {'type': 'integer'},
-                                                                'CpuPower': {'type': 'integer'},
-                                                                'Mem': {'type': 'integer'},
-                                                                'RootDisk': {'type': 'integer'},
-                                                                'Tags': {'items': {'type': 'string'},
+                                                 'properties': {'arch': {'type': 'string'},
+                                                                'availability-zone': {'type': 'string'},
+                                                                'cpu-cores': {'type': 'integer'},
+                                                                'cpu-power': {'type': 'integer'},
+                                                                'mem': {'type': 'integer'},
+                                                                'root-disk': {'type': 'integer'},
+                                                                'tags': {'items': {'type': 'string'},
                                                                          'type': 'array'}},
                                                  'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'Placement': {'additionalProperties': False,
-                                   'properties': {'Directive': {'type': 'string'},
-                                                  'Scope': {'type': 'string'}},
-                                   'required': ['Scope', 'Directive'],
+                                   'properties': {'directive': {'type': 'string'},
+                                                  'scope': {'type': 'string'}},
+                                   'required': ['scope', 'directive'],
                                    'type': 'object'},
                      'Value': {'additionalProperties': False,
                                'properties': {'arch': {'type': 'string'},
                                               'container': {'type': 'string'},
-                                              'cpu-cores': {'type': 'integer'},
+                                              'cores': {'type': 'integer'},
                                               'cpu-power': {'type': 'integer'},
                                               'instance-type': {'type': 'string'},
                                               'mem': {'type': 'integer'},
@@ -12276,21 +13290,7 @@ class MachineManagerFacade(Type):
                                               'tags': {'items': {'type': 'string'},
                                                        'type': 'array'},
                                               'virt-type': {'type': 'string'}},
-                               'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                               'type': 'object'}},
      'properties': {'AddMachines': {'properties': {'Params': {'$ref': '#/definitions/AddMachines'},
                                                    'Result': {'$ref': '#/definitions/AddMachinesResults'}},
                                     'type': 'object'}},
@@ -12298,15 +13298,153 @@ class MachineManagerFacade(Type):
     
 
     @ReturnMapping(AddMachinesResults)
-    async def AddMachines(self, machineparams):
+    async def AddMachines(self, params):
+        '''
+        params : typing.Sequence<+T_co>[~AddMachineParams]<~AddMachineParams>
+        Returns -> typing.Sequence<+T_co>[~AddMachinesResult]<~AddMachinesResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='MachineManager', request='AddMachines', version=2, params=_params)
+        _params['params'] = params
+        reply = await self.rpc(msg)
+        return reply
+
+
+class MachineUndertakerFacade(Type):
+    name = 'MachineUndertaker'
+    version = 1
+    schema =     {'definitions': {'Entities': {'additionalProperties': False,
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
+                                                              'type': 'array'}},
+                                  'required': ['entities'],
+                                  'type': 'object'},
+                     'EntitiesResult': {'additionalProperties': False,
+                                        'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
+                                                                    'type': 'array'},
+                                                       'error': {'$ref': '#/definitions/Error'}},
+                                        'required': ['entities'],
+                                        'type': 'object'},
+                     'EntitiesResults': {'additionalProperties': False,
+                                         'properties': {'results': {'items': {'$ref': '#/definitions/EntitiesResult'},
+                                                                    'type': 'array'}},
+                                         'required': ['results'],
+                                         'type': 'object'},
+                     'Entity': {'additionalProperties': False,
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
+                                'type': 'object'},
+                     'Error': {'additionalProperties': False,
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
+                               'type': 'object'},
+                     'ErrorInfo': {'additionalProperties': False,
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
+                                   'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
+                     'NotifyWatchResult': {'additionalProperties': False,
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
+                                           'type': 'object'},
+                     'NotifyWatchResults': {'additionalProperties': False,
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
+                                                                       'type': 'array'}},
+                                            'required': ['results'],
+                                            'type': 'object'},
+                     'ProviderInterfaceInfo': {'additionalProperties': False,
+                                               'properties': {'interface-name': {'type': 'string'},
+                                                              'mac-address': {'type': 'string'},
+                                                              'provider-id': {'type': 'string'}},
+                                               'required': ['interface-name',
+                                                            'mac-address',
+                                                            'provider-id'],
+                                               'type': 'object'},
+                     'ProviderInterfaceInfoResult': {'additionalProperties': False,
+                                                     'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                                    'interfaces': {'items': {'$ref': '#/definitions/ProviderInterfaceInfo'},
+                                                                                   'type': 'array'},
+                                                                    'machine-tag': {'type': 'string'}},
+                                                     'required': ['machine-tag',
+                                                                  'interfaces'],
+                                                     'type': 'object'},
+                     'ProviderInterfaceInfoResults': {'additionalProperties': False,
+                                                      'properties': {'results': {'items': {'$ref': '#/definitions/ProviderInterfaceInfoResult'},
+                                                                                 'type': 'array'}},
+                                                      'required': ['results'],
+                                                      'type': 'object'}},
+     'properties': {'AllMachineRemovals': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                          'Result': {'$ref': '#/definitions/EntitiesResults'}},
+                                           'type': 'object'},
+                    'CompleteMachineRemovals': {'properties': {'Params': {'$ref': '#/definitions/Entities'}},
+                                                'type': 'object'},
+                    'GetMachineProviderInterfaceInfo': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                                       'Result': {'$ref': '#/definitions/ProviderInterfaceInfoResults'}},
+                                                        'type': 'object'},
+                    'WatchMachineRemovals': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                            'Result': {'$ref': '#/definitions/NotifyWatchResults'}},
+                                             'type': 'object'}},
+     'type': 'object'}
+    
+
+    @ReturnMapping(EntitiesResults)
+    async def AllMachineRemovals(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~EntitiesResult]<~EntitiesResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='MachineUndertaker', request='AllMachineRemovals', version=1, params=_params)
+        _params['entities'] = entities
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(None)
+    async def CompleteMachineRemovals(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> None
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='MachineUndertaker', request='CompleteMachineRemovals', version=1, params=_params)
+        _params['entities'] = entities
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(ProviderInterfaceInfoResults)
+    async def GetMachineProviderInterfaceInfo(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ProviderInterfaceInfoResult]<~ProviderInterfaceInfoResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='MachineUndertaker', request='GetMachineProviderInterfaceInfo', version=1, params=_params)
+        _params['entities'] = entities
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(NotifyWatchResults)
+    async def WatchMachineRemovals(self, entities):
         '''
-        machineparams : typing.Sequence[~AddMachineParams]
-        Returns -> typing.Sequence[~AddMachinesResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MachineManager', Request='AddMachines', Version=2, Params=params)
-        params['MachineParams'] = machineparams
+        _params = dict()
+        msg = dict(type='MachineUndertaker', request='WatchMachineRemovals', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -12315,199 +13453,169 @@ class MachinerFacade(Type):
     name = 'Machiner'
     version = 1
     schema =     {'definitions': {'APIHostPortsResult': {'additionalProperties': False,
-                                            'properties': {'Servers': {'items': {'items': {'$ref': '#/definitions/HostPort'},
+                                            'properties': {'servers': {'items': {'items': {'$ref': '#/definitions/HostPort'},
                                                                                  'type': 'array'},
                                                                        'type': 'array'}},
-                                            'required': ['Servers'],
+                                            'required': ['servers'],
                                             'type': 'object'},
                      'Address': {'additionalProperties': False,
-                                 'properties': {'Scope': {'type': 'string'},
-                                                'SpaceName': {'type': 'string'},
-                                                'Type': {'type': 'string'},
-                                                'Value': {'type': 'string'}},
-                                 'required': ['Value', 'Type', 'Scope'],
+                                 'properties': {'scope': {'type': 'string'},
+                                                'space-name': {'type': 'string'},
+                                                'type': {'type': 'string'},
+                                                'value': {'type': 'string'}},
+                                 'required': ['value', 'type', 'scope'],
                                  'type': 'object'},
                      'BytesResult': {'additionalProperties': False,
-                                     'properties': {'Result': {'items': {'type': 'integer'},
+                                     'properties': {'result': {'items': {'type': 'integer'},
                                                                'type': 'array'}},
-                                     'required': ['Result'],
+                                     'required': ['result'],
                                      'type': 'object'},
                      'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'EntityStatusArgs': {'additionalProperties': False,
-                                          'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True,
+                                          'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                'type': 'object'}},
                                                                   'type': 'object'},
-                                                         'Info': {'type': 'string'},
-                                                         'Status': {'type': 'string'},
-                                                         'Tag': {'type': 'string'}},
-                                          'required': ['Tag',
-                                                       'Status',
-                                                       'Info',
-                                                       'Data'],
+                                                         'info': {'type': 'string'},
+                                                         'status': {'type': 'string'},
+                                                         'tag': {'type': 'string'}},
+                                          'required': ['tag',
+                                                       'status',
+                                                       'info',
+                                                       'data'],
                                           'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'HostPort': {'additionalProperties': False,
                                   'properties': {'Address': {'$ref': '#/definitions/Address'},
-                                                 'Port': {'type': 'integer'}},
-                                  'required': ['Address', 'Port'],
+                                                 'port': {'type': 'integer'}},
+                                  'required': ['Address', 'port'],
                                   'type': 'object'},
                      'JobsResult': {'additionalProperties': False,
-                                    'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                   'Jobs': {'items': {'type': 'string'},
+                                    'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                   'jobs': {'items': {'type': 'string'},
                                                             'type': 'array'}},
-                                    'required': ['Jobs', 'Error'],
+                                    'required': ['jobs'],
                                     'type': 'object'},
                      'JobsResults': {'additionalProperties': False,
-                                     'properties': {'Results': {'items': {'$ref': '#/definitions/JobsResult'},
+                                     'properties': {'results': {'items': {'$ref': '#/definitions/JobsResult'},
                                                                 'type': 'array'}},
-                                     'required': ['Results'],
+                                     'required': ['results'],
                                      'type': 'object'},
                      'LifeResult': {'additionalProperties': False,
-                                    'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                   'Life': {'type': 'string'}},
-                                    'required': ['Life', 'Error'],
+                                    'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                   'life': {'type': 'string'}},
+                                    'required': ['life'],
                                     'type': 'object'},
                      'LifeResults': {'additionalProperties': False,
-                                     'properties': {'Results': {'items': {'$ref': '#/definitions/LifeResult'},
+                                     'properties': {'results': {'items': {'$ref': '#/definitions/LifeResult'},
                                                                 'type': 'array'}},
-                                     'required': ['Results'],
+                                     'required': ['results'],
                                      'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'MachineAddresses': {'additionalProperties': False,
-                                          'properties': {'Addresses': {'items': {'$ref': '#/definitions/Address'},
+                                          'properties': {'addresses': {'items': {'$ref': '#/definitions/Address'},
                                                                        'type': 'array'},
-                                                         'Tag': {'type': 'string'}},
-                                          'required': ['Tag', 'Addresses'],
+                                                         'tag': {'type': 'string'}},
+                                          'required': ['tag', 'addresses'],
                                           'type': 'object'},
                      'NetworkConfig': {'additionalProperties': False,
-                                       'properties': {'Address': {'type': 'string'},
-                                                      'CIDR': {'type': 'string'},
-                                                      'ConfigType': {'type': 'string'},
-                                                      'DNSSearchDomains': {'items': {'type': 'string'},
-                                                                           'type': 'array'},
-                                                      'DNSServers': {'items': {'type': 'string'},
-                                                                     'type': 'array'},
-                                                      'DeviceIndex': {'type': 'integer'},
-                                                      'Disabled': {'type': 'boolean'},
-                                                      'GatewayAddress': {'type': 'string'},
-                                                      'InterfaceName': {'type': 'string'},
-                                                      'InterfaceType': {'type': 'string'},
-                                                      'MACAddress': {'type': 'string'},
-                                                      'MTU': {'type': 'integer'},
-                                                      'NoAutoStart': {'type': 'boolean'},
-                                                      'ParentInterfaceName': {'type': 'string'},
-                                                      'ProviderAddressId': {'type': 'string'},
-                                                      'ProviderId': {'type': 'string'},
-                                                      'ProviderSpaceId': {'type': 'string'},
-                                                      'ProviderSubnetId': {'type': 'string'},
-                                                      'ProviderVLANId': {'type': 'string'},
-                                                      'VLANTag': {'type': 'integer'}},
-                                       'required': ['DeviceIndex',
-                                                    'MACAddress',
-                                                    'CIDR',
-                                                    'MTU',
-                                                    'ProviderId',
-                                                    'ProviderSubnetId',
-                                                    'ProviderSpaceId',
-                                                    'ProviderAddressId',
-                                                    'ProviderVLANId',
-                                                    'VLANTag',
-                                                    'InterfaceName',
-                                                    'ParentInterfaceName',
-                                                    'InterfaceType',
-                                                    'Disabled'],
+                                       'properties': {'address': {'type': 'string'},
+                                                      'cidr': {'type': 'string'},
+                                                      'config-type': {'type': 'string'},
+                                                      'device-index': {'type': 'integer'},
+                                                      'disabled': {'type': 'boolean'},
+                                                      'dns-search-domains': {'items': {'type': 'string'},
+                                                                             'type': 'array'},
+                                                      'dns-servers': {'items': {'type': 'string'},
+                                                                      'type': 'array'},
+                                                      'gateway-address': {'type': 'string'},
+                                                      'interface-name': {'type': 'string'},
+                                                      'interface-type': {'type': 'string'},
+                                                      'mac-address': {'type': 'string'},
+                                                      'mtu': {'type': 'integer'},
+                                                      'no-auto-start': {'type': 'boolean'},
+                                                      'parent-interface-name': {'type': 'string'},
+                                                      'provider-address-id': {'type': 'string'},
+                                                      'provider-id': {'type': 'string'},
+                                                      'provider-space-id': {'type': 'string'},
+                                                      'provider-subnet-id': {'type': 'string'},
+                                                      'provider-vlan-id': {'type': 'string'},
+                                                      'vlan-tag': {'type': 'integer'}},
+                                       'required': ['device-index',
+                                                    'mac-address',
+                                                    'cidr',
+                                                    'mtu',
+                                                    'provider-id',
+                                                    'provider-subnet-id',
+                                                    'provider-space-id',
+                                                    'provider-address-id',
+                                                    'provider-vlan-id',
+                                                    'vlan-tag',
+                                                    'interface-name',
+                                                    'parent-interface-name',
+                                                    'interface-type',
+                                                    'disabled'],
                                        'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
                      'NotifyWatchResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
+                                            'required': ['results'],
                                             'type': 'object'},
                      'SetMachineNetworkConfig': {'additionalProperties': False,
-                                                 'properties': {'Config': {'items': {'$ref': '#/definitions/NetworkConfig'},
+                                                 'properties': {'config': {'items': {'$ref': '#/definitions/NetworkConfig'},
                                                                            'type': 'array'},
-                                                                'Tag': {'type': 'string'}},
-                                                 'required': ['Tag', 'Config'],
+                                                                'tag': {'type': 'string'}},
+                                                 'required': ['tag', 'config'],
                                                  'type': 'object'},
                      'SetMachinesAddresses': {'additionalProperties': False,
-                                              'properties': {'MachineAddresses': {'items': {'$ref': '#/definitions/MachineAddresses'},
-                                                                                  'type': 'array'}},
-                                              'required': ['MachineAddresses'],
+                                              'properties': {'machine-addresses': {'items': {'$ref': '#/definitions/MachineAddresses'},
+                                                                                   'type': 'array'}},
+                                              'required': ['machine-addresses'],
                                               'type': 'object'},
                      'SetStatus': {'additionalProperties': False,
-                                   'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'},
+                                   'properties': {'entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'},
                                                                'type': 'array'}},
-                                   'required': ['Entities'],
+                                   'required': ['entities'],
                                    'type': 'object'},
                      'StringResult': {'additionalProperties': False,
-                                      'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                     'Result': {'type': 'string'}},
-                                      'required': ['Error', 'Result'],
+                                      'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                     'result': {'type': 'string'}},
+                                      'required': ['result'],
                                       'type': 'object'},
                      'StringsResult': {'additionalProperties': False,
-                                       'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                      'Result': {'items': {'type': 'string'},
+                                       'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                      'result': {'items': {'type': 'string'},
                                                                  'type': 'array'}},
-                                       'required': ['Error', 'Result'],
-                                       'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                       'type': 'object'}},
      'properties': {'APIAddresses': {'properties': {'Result': {'$ref': '#/definitions/StringsResult'}},
                                      'type': 'object'},
                     'APIHostPorts': {'properties': {'Result': {'$ref': '#/definitions/APIHostPortsResult'}},
@@ -12551,11 +13659,11 @@ class MachinerFacade(Type):
     async def APIAddresses(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence[str]]
+        Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence<+T_co>[str]]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Machiner', Request='APIAddresses', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Machiner', request='APIAddresses', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -12566,11 +13674,11 @@ class MachinerFacade(Type):
     async def APIHostPorts(self):
         '''
 
-        Returns -> typing.Sequence[~HostPort]
+        Returns -> typing.Sequence<+T_co>[~HostPort]<~HostPort>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Machiner', Request='APIHostPorts', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Machiner', request='APIHostPorts', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -12581,11 +13689,11 @@ class MachinerFacade(Type):
     async def CACert(self):
         '''
 
-        Returns -> typing.Sequence[int]
+        Returns -> typing.Sequence<+T_co>[int]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Machiner', Request='CACert', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Machiner', request='CACert', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -12595,13 +13703,13 @@ class MachinerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def EnsureDead(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Machiner', Request='EnsureDead', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Machiner', request='EnsureDead', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -12610,13 +13718,13 @@ class MachinerFacade(Type):
     @ReturnMapping(JobsResults)
     async def Jobs(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~JobsResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~JobsResult]<~JobsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Machiner', Request='Jobs', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Machiner', request='Jobs', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -12625,13 +13733,13 @@ class MachinerFacade(Type):
     @ReturnMapping(LifeResults)
     async def Life(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~LifeResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~LifeResult]<~LifeResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Machiner', Request='Life', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Machiner', request='Life', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -12644,8 +13752,8 @@ class MachinerFacade(Type):
         Returns -> typing.Union[_ForwardRef('Error'), str]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Machiner', Request='ModelUUID', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Machiner', request='ModelUUID', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -12653,15 +13761,15 @@ class MachinerFacade(Type):
 
 
     @ReturnMapping(ErrorResults)
-    async def SetMachineAddresses(self, machineaddresses):
+    async def SetMachineAddresses(self, machine_addresses):
         '''
-        machineaddresses : typing.Sequence[~MachineAddresses]
-        Returns -> typing.Sequence[~ErrorResult]
+        machine_addresses : typing.Sequence<+T_co>[~MachineAddresses]<~MachineAddresses>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Machiner', Request='SetMachineAddresses', Version=1, Params=params)
-        params['MachineAddresses'] = machineaddresses
+        _params = dict()
+        msg = dict(type='Machiner', request='SetMachineAddresses', version=1, params=_params)
+        _params['machine-addresses'] = machine_addresses
         reply = await self.rpc(msg)
         return reply
 
@@ -12670,15 +13778,15 @@ class MachinerFacade(Type):
     @ReturnMapping(None)
     async def SetObservedNetworkConfig(self, config, tag):
         '''
-        config : typing.Sequence[~NetworkConfig]
+        config : typing.Sequence<+T_co>[~NetworkConfig]<~NetworkConfig>
         tag : str
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Machiner', Request='SetObservedNetworkConfig', Version=1, Params=params)
-        params['Config'] = config
-        params['Tag'] = tag
+        _params = dict()
+        msg = dict(type='Machiner', request='SetObservedNetworkConfig', version=1, params=_params)
+        _params['config'] = config
+        _params['tag'] = tag
         reply = await self.rpc(msg)
         return reply
 
@@ -12687,13 +13795,13 @@ class MachinerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetProviderNetworkConfig(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Machiner', Request='SetProviderNetworkConfig', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Machiner', request='SetProviderNetworkConfig', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -12702,13 +13810,13 @@ class MachinerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetStatus(self, entities):
         '''
-        entities : typing.Sequence[~EntityStatusArgs]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Machiner', Request='SetStatus', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Machiner', request='SetStatus', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -12717,13 +13825,13 @@ class MachinerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def UpdateStatus(self, entities):
         '''
-        entities : typing.Sequence[~EntityStatusArgs]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Machiner', Request='UpdateStatus', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Machiner', request='UpdateStatus', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -12732,13 +13840,13 @@ class MachinerFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def Watch(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Machiner', Request='Watch', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Machiner', request='Watch', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -12748,11 +13856,11 @@ class MachinerFacade(Type):
     async def WatchAPIHostPorts(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), str]
+        Returns -> typing.Union[str, _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Machiner', Request='WatchAPIHostPorts', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Machiner', request='WatchAPIHostPorts', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -12762,74 +13870,46 @@ class MeterStatusFacade(Type):
     name = 'MeterStatus'
     version = 1
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'MeterStatusResult': {'additionalProperties': False,
-                                           'properties': {'Code': {'type': 'string'},
-                                                          'Error': {'$ref': '#/definitions/Error'},
-                                                          'Info': {'type': 'string'}},
-                                           'required': ['Code', 'Info', 'Error'],
+                                           'properties': {'code': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'},
+                                                          'info': {'type': 'string'}},
+                                           'required': ['code', 'info'],
                                            'type': 'object'},
                      'MeterStatusResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/MeterStatusResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/MeterStatusResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
+                                            'required': ['results'],
                                             'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
                      'NotifyWatchResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
-                                            'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                            'required': ['results'],
+                                            'type': 'object'}},
      'properties': {'GetMeterStatus': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                       'Result': {'$ref': '#/definitions/MeterStatusResults'}},
                                        'type': 'object'},
@@ -12842,13 +13922,13 @@ class MeterStatusFacade(Type):
     @ReturnMapping(MeterStatusResults)
     async def GetMeterStatus(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~MeterStatusResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~MeterStatusResult]<~MeterStatusResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MeterStatus', Request='GetMeterStatus', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='MeterStatus', request='GetMeterStatus', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -12857,13 +13937,13 @@ class MeterStatusFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def WatchMeterStatus(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MeterStatus', Request='WatchMeterStatus', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='MeterStatus', request='WatchMeterStatus', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -12872,82 +13952,53 @@ class MetricsAdderFacade(Type):
     name = 'MetricsAdder'
     version = 2
     schema =     {'definitions': {'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'Metric': {'additionalProperties': False,
-                                'properties': {'Key': {'type': 'string'},
-                                               'Time': {'format': 'date-time',
+                                'properties': {'key': {'type': 'string'},
+                                               'time': {'format': 'date-time',
                                                         'type': 'string'},
-                                               'Value': {'type': 'string'}},
-                                'required': ['Key', 'Value', 'Time'],
+                                               'value': {'type': 'string'}},
+                                'required': ['key', 'value', 'time'],
                                 'type': 'object'},
                      'MetricBatch': {'additionalProperties': False,
-                                     'properties': {'CharmURL': {'type': 'string'},
-                                                    'Created': {'format': 'date-time',
+                                     'properties': {'charm-url': {'type': 'string'},
+                                                    'created': {'format': 'date-time',
                                                                 'type': 'string'},
-                                                    'Metrics': {'items': {'$ref': '#/definitions/Metric'},
+                                                    'metrics': {'items': {'$ref': '#/definitions/Metric'},
                                                                 'type': 'array'},
-                                                    'UUID': {'type': 'string'}},
-                                     'required': ['UUID',
-                                                  'CharmURL',
-                                                  'Created',
-                                                  'Metrics'],
+                                                    'uuid': {'type': 'string'}},
+                                     'required': ['uuid',
+                                                  'charm-url',
+                                                  'created',
+                                                  'metrics'],
                                      'type': 'object'},
                      'MetricBatchParam': {'additionalProperties': False,
-                                          'properties': {'Batch': {'$ref': '#/definitions/MetricBatch'},
-                                                         'Tag': {'type': 'string'}},
-                                          'required': ['Tag', 'Batch'],
+                                          'properties': {'batch': {'$ref': '#/definitions/MetricBatch'},
+                                                         'tag': {'type': 'string'}},
+                                          'required': ['tag', 'batch'],
                                           'type': 'object'},
                      'MetricBatchParams': {'additionalProperties': False,
-                                           'properties': {'Batches': {'items': {'$ref': '#/definitions/MetricBatchParam'},
+                                           'properties': {'batches': {'items': {'$ref': '#/definitions/MetricBatchParam'},
                                                                       'type': 'array'}},
-                                           'required': ['Batches'],
-                                           'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                           'required': ['batches'],
+                                           'type': 'object'}},
      'properties': {'AddMetricBatches': {'properties': {'Params': {'$ref': '#/definitions/MetricBatchParams'},
                                                         'Result': {'$ref': '#/definitions/ErrorResults'}},
                                          'type': 'object'}},
@@ -12957,13 +14008,13 @@ class MetricsAdderFacade(Type):
     @ReturnMapping(ErrorResults)
     async def AddMetricBatches(self, batches):
         '''
-        batches : typing.Sequence[~MetricBatchParam]
-        Returns -> typing.Sequence[~ErrorResult]
+        batches : typing.Sequence<+T_co>[~MetricBatchParam]<~MetricBatchParam>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MetricsAdder', Request='AddMetricBatches', Version=2, Params=params)
-        params['Batches'] = batches
+        _params = dict()
+        msg = dict(type='MetricsAdder', request='AddMetricBatches', version=2, params=_params)
+        _params['batches'] = batches
         reply = await self.rpc(msg)
         return reply
 
@@ -12972,13 +14023,13 @@ class MetricsDebugFacade(Type):
     name = 'MetricsDebug'
     version = 2
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'EntityMetrics': {'additionalProperties': False,
                                        'properties': {'error': {'$ref': '#/definitions/Error'},
@@ -12986,39 +14037,24 @@ class MetricsDebugFacade(Type):
                                                                   'type': 'array'}},
                                        'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'MeterStatusParam': {'additionalProperties': False,
                                           'properties': {'code': {'type': 'string'},
                                                          'info': {'type': 'string'},
@@ -13034,28 +14070,15 @@ class MetricsDebugFacade(Type):
                                       'properties': {'key': {'type': 'string'},
                                                      'time': {'format': 'date-time',
                                                               'type': 'string'},
+                                                     'unit': {'type': 'string'},
                                                      'value': {'type': 'string'}},
-                                      'required': ['time', 'key', 'value'],
+                                      'required': ['time', 'key', 'value', 'unit'],
                                       'type': 'object'},
                      'MetricResults': {'additionalProperties': False,
                                        'properties': {'results': {'items': {'$ref': '#/definitions/EntityMetrics'},
                                                                   'type': 'array'}},
                                        'required': ['results'],
-                                       'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                       'type': 'object'}},
      'properties': {'GetMetrics': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                   'Result': {'$ref': '#/definitions/MetricResults'}},
                                    'type': 'object'},
@@ -13068,13 +14091,13 @@ class MetricsDebugFacade(Type):
     @ReturnMapping(MetricResults)
     async def GetMetrics(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~EntityMetrics]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~EntityMetrics]<~EntityMetrics>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MetricsDebug', Request='GetMetrics', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='MetricsDebug', request='GetMetrics', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -13083,13 +14106,13 @@ class MetricsDebugFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetMeterStatus(self, statues):
         '''
-        statues : typing.Sequence[~MeterStatusParam]
-        Returns -> typing.Sequence[~ErrorResult]
+        statues : typing.Sequence<+T_co>[~MeterStatusParam]<~MeterStatusParam>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MetricsDebug', Request='SetMeterStatus', Version=2, Params=params)
-        params['statues'] = statues
+        _params = dict()
+        msg = dict(type='MetricsDebug', request='SetMeterStatus', version=2, params=_params)
+        _params['statues'] = statues
         reply = await self.rpc(msg)
         return reply
 
@@ -13098,62 +14121,33 @@ class MetricsManagerFacade(Type):
     name = 'MetricsManager'
     version = 1
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
-                     'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
-                                                                 'type': 'array'}},
-                                      'required': ['Results'],
-                                      'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                     'ErrorResults': {'additionalProperties': False,
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                                                 'type': 'array'}},
+                                      'required': ['results'],
+                                      'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'}},
      'properties': {'CleanupOldMetrics': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                          'Result': {'$ref': '#/definitions/ErrorResults'}},
                                           'type': 'object'},
@@ -13166,13 +14160,13 @@ class MetricsManagerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def CleanupOldMetrics(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MetricsManager', Request='CleanupOldMetrics', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='MetricsManager', request='CleanupOldMetrics', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -13181,13 +14175,13 @@ class MetricsManagerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SendMetrics(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MetricsManager', Request='SendMetrics', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='MetricsManager', request='SendMetrics', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -13196,73 +14190,44 @@ class MigrationFlagFacade(Type):
     name = 'MigrationFlag'
     version = 1
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
                      'NotifyWatchResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
+                                            'required': ['results'],
                                             'type': 'object'},
                      'PhaseResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'},
+                                     'properties': {'error': {'$ref': '#/definitions/Error'},
                                                     'phase': {'type': 'string'}},
-                                     'required': ['phase', 'Error'],
                                      'type': 'object'},
                      'PhaseResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/PhaseResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/PhaseResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
-                                      'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                      'required': ['results'],
+                                      'type': 'object'}},
      'properties': {'Phase': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                              'Result': {'$ref': '#/definitions/PhaseResults'}},
                               'type': 'object'},
@@ -13275,13 +14240,13 @@ class MigrationFlagFacade(Type):
     @ReturnMapping(PhaseResults)
     async def Phase(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~PhaseResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~PhaseResult]<~PhaseResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MigrationFlag', Request='Phase', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='MigrationFlag', request='Phase', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -13290,13 +14255,13 @@ class MigrationFlagFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def Watch(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MigrationFlag', Request='Watch', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='MigrationFlag', request='Watch', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -13305,93 +14270,133 @@ class MigrationMasterFacade(Type):
     name = 'MigrationMaster'
     version = 1
     schema =     {'definitions': {'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
-                     'FullMigrationStatus': {'additionalProperties': False,
-                                             'properties': {'attempt': {'type': 'integer'},
-                                                            'phase': {'type': 'string'},
-                                                            'spec': {'$ref': '#/definitions/ModelMigrationSpec'}},
-                                             'required': ['spec',
-                                                          'attempt',
-                                                          'phase'],
-                                             'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
-                     'ModelMigrationSpec': {'additionalProperties': False,
-                                            'properties': {'model-tag': {'type': 'string'},
-                                                           'target-info': {'$ref': '#/definitions/ModelMigrationTargetInfo'}},
-                                            'required': ['model-tag',
-                                                         'target-info'],
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
+                     'MasterMigrationStatus': {'additionalProperties': False,
+                                               'properties': {'migration-id': {'type': 'string'},
+                                                              'phase': {'type': 'string'},
+                                                              'phase-changed-time': {'format': 'date-time',
+                                                                                     'type': 'string'},
+                                                              'spec': {'$ref': '#/definitions/MigrationSpec'}},
+                                               'required': ['spec',
+                                                            'migration-id',
+                                                            'phase',
+                                                            'phase-changed-time'],
+                                               'type': 'object'},
+                     'MigrationModelInfo': {'additionalProperties': False,
+                                            'properties': {'agent-version': {'$ref': '#/definitions/Number'},
+                                                           'name': {'type': 'string'},
+                                                           'owner-tag': {'type': 'string'},
+                                                           'uuid': {'type': 'string'}},
+                                            'required': ['uuid',
+                                                         'name',
+                                                         'owner-tag',
+                                                         'agent-version'],
                                             'type': 'object'},
-                     'ModelMigrationTargetInfo': {'additionalProperties': False,
-                                                  'properties': {'addrs': {'items': {'type': 'string'},
-                                                                           'type': 'array'},
-                                                                 'auth-tag': {'type': 'string'},
-                                                                 'ca-cert': {'type': 'string'},
-                                                                 'controller-tag': {'type': 'string'},
-                                                                 'password': {'type': 'string'}},
-                                                  'required': ['controller-tag',
-                                                               'addrs',
-                                                               'ca-cert',
-                                                               'auth-tag',
-                                                               'password'],
-                                                  'type': 'object'},
+                     'MigrationSpec': {'additionalProperties': False,
+                                       'properties': {'external-control': {'type': 'boolean'},
+                                                      'model-tag': {'type': 'string'},
+                                                      'skip-initial-prechecks': {'type': 'boolean'},
+                                                      'target-info': {'$ref': '#/definitions/MigrationTargetInfo'}},
+                                       'required': ['model-tag',
+                                                    'target-info',
+                                                    'external-control',
+                                                    'skip-initial-prechecks'],
+                                       'type': 'object'},
+                     'MigrationTargetInfo': {'additionalProperties': False,
+                                             'properties': {'addrs': {'items': {'type': 'string'},
+                                                                      'type': 'array'},
+                                                            'auth-tag': {'type': 'string'},
+                                                            'ca-cert': {'type': 'string'},
+                                                            'controller-tag': {'type': 'string'},
+                                                            'macaroons': {'type': 'string'},
+                                                            'password': {'type': 'string'}},
+                                             'required': ['controller-tag',
+                                                          'addrs',
+                                                          'ca-cert',
+                                                          'auth-tag'],
+                                             'type': 'object'},
+                     'MinionReports': {'additionalProperties': False,
+                                       'properties': {'failed': {'items': {'type': 'string'},
+                                                                 'type': 'array'},
+                                                      'migration-id': {'type': 'string'},
+                                                      'phase': {'type': 'string'},
+                                                      'success-count': {'type': 'integer'},
+                                                      'unknown-count': {'type': 'integer'},
+                                                      'unknown-sample': {'items': {'type': 'string'},
+                                                                         'type': 'array'}},
+                                       'required': ['migration-id',
+                                                    'phase',
+                                                    'success-count',
+                                                    'unknown-count',
+                                                    'unknown-sample',
+                                                    'failed'],
+                                       'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
+                     'Number': {'additionalProperties': False,
+                                'properties': {'Build': {'type': 'integer'},
+                                               'Major': {'type': 'integer'},
+                                               'Minor': {'type': 'integer'},
+                                               'Patch': {'type': 'integer'},
+                                               'Tag': {'type': 'string'}},
+                                'required': ['Major',
+                                             'Minor',
+                                             'Tag',
+                                             'Patch',
+                                             'Build'],
+                                'type': 'object'},
                      'SerializedModel': {'additionalProperties': False,
                                          'properties': {'bytes': {'items': {'type': 'integer'},
+                                                                  'type': 'array'},
+                                                        'charms': {'items': {'type': 'string'},
+                                                                   'type': 'array'},
+                                                        'tools': {'items': {'$ref': '#/definitions/SerializedModelTools'},
                                                                   'type': 'array'}},
-                                         'required': ['bytes'],
+                                         'required': ['bytes', 'charms', 'tools'],
                                          'type': 'object'},
+                     'SerializedModelTools': {'additionalProperties': False,
+                                              'properties': {'uri': {'type': 'string'},
+                                                             'version': {'type': 'string'}},
+                                              'required': ['version', 'uri'],
+                                              'type': 'object'},
                      'SetMigrationPhaseArgs': {'additionalProperties': False,
                                                'properties': {'phase': {'type': 'string'}},
                                                'required': ['phase'],
                                                'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                     'SetMigrationStatusMessageArgs': {'additionalProperties': False,
+                                                       'properties': {'message': {'type': 'string'}},
+                                                       'required': ['message'],
+                                                       'type': 'object'}},
      'properties': {'Export': {'properties': {'Result': {'$ref': '#/definitions/SerializedModel'}},
                                'type': 'object'},
-                    'GetMigrationStatus': {'properties': {'Result': {'$ref': '#/definitions/FullMigrationStatus'}},
-                                           'type': 'object'},
+                    'MigrationStatus': {'properties': {'Result': {'$ref': '#/definitions/MasterMigrationStatus'}},
+                                        'type': 'object'},
+                    'MinionReports': {'properties': {'Result': {'$ref': '#/definitions/MinionReports'}},
+                                      'type': 'object'},
+                    'ModelInfo': {'properties': {'Result': {'$ref': '#/definitions/MigrationModelInfo'}},
+                                  'type': 'object'},
+                    'Prechecks': {'type': 'object'},
+                    'Reap': {'type': 'object'},
                     'SetPhase': {'properties': {'Params': {'$ref': '#/definitions/SetMigrationPhaseArgs'}},
                                  'type': 'object'},
+                    'SetStatusMessage': {'properties': {'Params': {'$ref': '#/definitions/SetMigrationStatusMessageArgs'}},
+                                         'type': 'object'},
                     'Watch': {'properties': {'Result': {'$ref': '#/definitions/NotifyWatchResult'}},
-                              'type': 'object'}},
+                              'type': 'object'},
+                    'WatchMinionReports': {'properties': {'Result': {'$ref': '#/definitions/NotifyWatchResult'}},
+                                           'type': 'object'}},
      'type': 'object'}
     
 
@@ -13399,26 +14404,86 @@ class MigrationMasterFacade(Type):
     async def Export(self):
         '''
 
-        Returns -> typing.Sequence[int]
+        Returns -> typing.Sequence<+T_co>[~SerializedModelTools]<~SerializedModelTools>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='MigrationMaster', request='Export', version=1, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(MasterMigrationStatus)
+    async def MigrationStatus(self):
+        '''
+
+        Returns -> typing.Union[str, _ForwardRef('MigrationSpec')]
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='MigrationMaster', request='MigrationStatus', version=1, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(MinionReports)
+    async def MinionReports(self):
+        '''
+
+        Returns -> typing.Union[typing.Sequence<+T_co>[str], int]
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='MigrationMaster', request='MinionReports', version=1, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(MigrationModelInfo)
+    async def ModelInfo(self):
+        '''
+
+        Returns -> typing.Union[_ForwardRef('Number'), str]
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='MigrationMaster', request='ModelInfo', version=1, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(None)
+    async def Prechecks(self):
+        '''
+
+        Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MigrationMaster', Request='Export', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='MigrationMaster', request='Prechecks', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
 
 
 
-    @ReturnMapping(FullMigrationStatus)
-    async def GetMigrationStatus(self):
+    @ReturnMapping(None)
+    async def Reap(self):
         '''
 
-        Returns -> typing.Union[int, str, _ForwardRef('ModelMigrationSpec')]
+        Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MigrationMaster', Request='GetMigrationStatus', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='MigrationMaster', request='Reap', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -13432,9 +14497,24 @@ class MigrationMasterFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MigrationMaster', Request='SetPhase', Version=1, Params=params)
-        params['phase'] = phase
+        _params = dict()
+        msg = dict(type='MigrationMaster', request='SetPhase', version=1, params=_params)
+        _params['phase'] = phase
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(None)
+    async def SetStatusMessage(self, message):
+        '''
+        message : str
+        Returns -> None
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='MigrationMaster', request='SetStatusMessage', version=1, params=_params)
+        _params['message'] = message
         reply = await self.rpc(msg)
         return reply
 
@@ -13444,11 +14524,26 @@ class MigrationMasterFacade(Type):
     async def Watch(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), str]
+        Returns -> typing.Union[str, _ForwardRef('Error')]
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='MigrationMaster', request='Watch', version=1, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(NotifyWatchResult)
+    async def WatchMinionReports(self):
+        '''
+
+        Returns -> typing.Union[str, _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MigrationMaster', Request='Watch', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='MigrationMaster', request='WatchMinionReports', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -13458,63 +14553,64 @@ class MigrationMinionFacade(Type):
     name = 'MigrationMinion'
     version = 1
     schema =     {'definitions': {'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
+                     'MinionReport': {'additionalProperties': False,
+                                      'properties': {'migration-id': {'type': 'string'},
+                                                     'phase': {'type': 'string'},
+                                                     'success': {'type': 'boolean'}},
+                                      'required': ['migration-id',
+                                                   'phase',
+                                                   'success'],
+                                      'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
-                                           'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
-     'properties': {'Watch': {'properties': {'Result': {'$ref': '#/definitions/NotifyWatchResult'}},
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
+                                           'type': 'object'}},
+     'properties': {'Report': {'properties': {'Params': {'$ref': '#/definitions/MinionReport'}},
+                               'type': 'object'},
+                    'Watch': {'properties': {'Result': {'$ref': '#/definitions/NotifyWatchResult'}},
                               'type': 'object'}},
      'type': 'object'}
     
 
+    @ReturnMapping(None)
+    async def Report(self, migration_id, phase, success):
+        '''
+        migration_id : str
+        phase : str
+        success : bool
+        Returns -> None
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='MigrationMinion', request='Report', version=1, params=_params)
+        _params['migration-id'] = migration_id
+        _params['phase'] = phase
+        _params['success'] = success
+        reply = await self.rpc(msg)
+        return reply
+
+
+
     @ReturnMapping(NotifyWatchResult)
     async def Watch(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), str]
+        Returns -> typing.Union[str, _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MigrationMinion', Request='Watch', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='MigrationMinion', request='Watch', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -13525,6 +14621,8 @@ class MigrationStatusWatcherFacade(Type):
     version = 1
     schema =     {'definitions': {'MigrationStatus': {'additionalProperties': False,
                                          'properties': {'attempt': {'type': 'integer'},
+                                                        'external-control': {'type': 'boolean'},
+                                                        'migration-id': {'type': 'string'},
                                                         'phase': {'type': 'string'},
                                                         'source-api-addrs': {'items': {'type': 'string'},
                                                                              'type': 'array'},
@@ -13532,8 +14630,10 @@ class MigrationStatusWatcherFacade(Type):
                                                         'target-api-addrs': {'items': {'type': 'string'},
                                                                              'type': 'array'},
                                                         'target-ca-cert': {'type': 'string'}},
-                                         'required': ['attempt',
+                                         'required': ['migration-id',
+                                                      'attempt',
                                                       'phase',
+                                                      'external-control',
                                                       'source-api-addrs',
                                                       'source-ca-cert',
                                                       'target-api-addrs',
@@ -13549,11 +14649,11 @@ class MigrationStatusWatcherFacade(Type):
     async def Next(self):
         '''
 
-        Returns -> typing.Union[int, typing.Sequence[str]]
+        Returns -> typing.Union[int, typing.Sequence<+T_co>[str]]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MigrationStatusWatcher', Request='Next', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='MigrationStatusWatcher', request='Next', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -13567,8 +14667,8 @@ class MigrationStatusWatcherFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MigrationStatusWatcher', Request='Stop', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='MigrationStatusWatcher', request='Stop', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -13577,21 +14677,54 @@ class MigrationStatusWatcherFacade(Type):
 class MigrationTargetFacade(Type):
     name = 'MigrationTarget'
     version = 1
-    schema =     {'definitions': {'ModelArgs': {'additionalProperties': False,
+    schema =     {'definitions': {'MigrationModelInfo': {'additionalProperties': False,
+                                            'properties': {'agent-version': {'$ref': '#/definitions/Number'},
+                                                           'name': {'type': 'string'},
+                                                           'owner-tag': {'type': 'string'},
+                                                           'uuid': {'type': 'string'}},
+                                            'required': ['uuid',
+                                                         'name',
+                                                         'owner-tag',
+                                                         'agent-version'],
+                                            'type': 'object'},
+                     'ModelArgs': {'additionalProperties': False,
                                    'properties': {'model-tag': {'type': 'string'}},
                                    'required': ['model-tag'],
                                    'type': 'object'},
+                     'Number': {'additionalProperties': False,
+                                'properties': {'Build': {'type': 'integer'},
+                                               'Major': {'type': 'integer'},
+                                               'Minor': {'type': 'integer'},
+                                               'Patch': {'type': 'integer'},
+                                               'Tag': {'type': 'string'}},
+                                'required': ['Major',
+                                             'Minor',
+                                             'Tag',
+                                             'Patch',
+                                             'Build'],
+                                'type': 'object'},
                      'SerializedModel': {'additionalProperties': False,
                                          'properties': {'bytes': {'items': {'type': 'integer'},
+                                                                  'type': 'array'},
+                                                        'charms': {'items': {'type': 'string'},
+                                                                   'type': 'array'},
+                                                        'tools': {'items': {'$ref': '#/definitions/SerializedModelTools'},
                                                                   'type': 'array'}},
-                                         'required': ['bytes'],
-                                         'type': 'object'}},
+                                         'required': ['bytes', 'charms', 'tools'],
+                                         'type': 'object'},
+                     'SerializedModelTools': {'additionalProperties': False,
+                                              'properties': {'uri': {'type': 'string'},
+                                                             'version': {'type': 'string'}},
+                                              'required': ['version', 'uri'],
+                                              'type': 'object'}},
      'properties': {'Abort': {'properties': {'Params': {'$ref': '#/definitions/ModelArgs'}},
                               'type': 'object'},
                     'Activate': {'properties': {'Params': {'$ref': '#/definitions/ModelArgs'}},
                                  'type': 'object'},
                     'Import': {'properties': {'Params': {'$ref': '#/definitions/SerializedModel'}},
-                               'type': 'object'}},
+                               'type': 'object'},
+                    'Prechecks': {'properties': {'Params': {'$ref': '#/definitions/MigrationModelInfo'}},
+                                  'type': 'object'}},
      'type': 'object'}
     
 
@@ -13602,9 +14735,9 @@ class MigrationTargetFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MigrationTarget', Request='Abort', Version=1, Params=params)
-        params['model-tag'] = model_tag
+        _params = dict()
+        msg = dict(type='MigrationTarget', request='Abort', version=1, params=_params)
+        _params['model-tag'] = model_tag
         reply = await self.rpc(msg)
         return reply
 
@@ -13617,24 +14750,127 @@ class MigrationTargetFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MigrationTarget', Request='Activate', Version=1, Params=params)
-        params['model-tag'] = model_tag
+        _params = dict()
+        msg = dict(type='MigrationTarget', request='Activate', version=1, params=_params)
+        _params['model-tag'] = model_tag
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(None)
+    async def Import(self, bytes_, charms, tools):
+        '''
+        bytes_ : typing.Sequence<+T_co>[int]
+        charms : typing.Sequence<+T_co>[str]
+        tools : typing.Sequence<+T_co>[~SerializedModelTools]<~SerializedModelTools>
+        Returns -> None
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='MigrationTarget', request='Import', version=1, params=_params)
+        _params['bytes'] = bytes_
+        _params['charms'] = charms
+        _params['tools'] = tools
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(None)
+    async def Prechecks(self, agent_version, name, owner_tag, uuid):
+        '''
+        agent_version : Number
+        name : str
+        owner_tag : str
+        uuid : str
+        Returns -> None
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='MigrationTarget', request='Prechecks', version=1, params=_params)
+        _params['agent-version'] = agent_version
+        _params['name'] = name
+        _params['owner-tag'] = owner_tag
+        _params['uuid'] = uuid
+        reply = await self.rpc(msg)
+        return reply
+
+
+class ModelConfigFacade(Type):
+    name = 'ModelConfig'
+    version = 1
+    schema =     {'definitions': {'ConfigValue': {'additionalProperties': False,
+                                     'properties': {'source': {'type': 'string'},
+                                                    'value': {'additionalProperties': True,
+                                                              'type': 'object'}},
+                                     'required': ['value', 'source'],
+                                     'type': 'object'},
+                     'ModelConfigResults': {'additionalProperties': False,
+                                            'properties': {'config': {'patternProperties': {'.*': {'$ref': '#/definitions/ConfigValue'}},
+                                                                      'type': 'object'}},
+                                            'required': ['config'],
+                                            'type': 'object'},
+                     'ModelSet': {'additionalProperties': False,
+                                  'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                                                                         'type': 'object'}},
+                                                            'type': 'object'}},
+                                  'required': ['config'],
+                                  'type': 'object'},
+                     'ModelUnset': {'additionalProperties': False,
+                                    'properties': {'keys': {'items': {'type': 'string'},
+                                                            'type': 'array'}},
+                                    'required': ['keys'],
+                                    'type': 'object'}},
+     'properties': {'ModelGet': {'properties': {'Result': {'$ref': '#/definitions/ModelConfigResults'}},
+                                 'type': 'object'},
+                    'ModelSet': {'properties': {'Params': {'$ref': '#/definitions/ModelSet'}},
+                                 'type': 'object'},
+                    'ModelUnset': {'properties': {'Params': {'$ref': '#/definitions/ModelUnset'}},
+                                   'type': 'object'}},
+     'type': 'object'}
+    
+
+    @ReturnMapping(ModelConfigResults)
+    async def ModelGet(self):
+        '''
+
+        Returns -> typing.Mapping<~KT, +VT_co>[str, ~ConfigValue]<~ConfigValue>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='ModelConfig', request='ModelGet', version=1, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(None)
+    async def ModelSet(self, config):
+        '''
+        config : typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        Returns -> None
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='ModelConfig', request='ModelSet', version=1, params=_params)
+        _params['config'] = config
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(None)
-    async def Import(self, bytes_):
+    async def ModelUnset(self, keys):
         '''
-        bytes_ : typing.Sequence[int]
+        keys : typing.Sequence<+T_co>[str]
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='MigrationTarget', Request='Import', Version=1, Params=params)
-        params['bytes'] = bytes_
+        _params = dict()
+        msg = dict(type='ModelConfig', request='ModelUnset', version=1, params=_params)
+        _params['keys'] = keys
         reply = await self.rpc(msg)
         return reply
 
@@ -13643,107 +14879,130 @@ class ModelManagerFacade(Type):
     name = 'ModelManager'
     version = 2
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'EntityStatus': {'additionalProperties': False,
-                                      'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True,
+                                      'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                            'type': 'object'}},
                                                               'type': 'object'},
-                                                     'Info': {'type': 'string'},
-                                                     'Since': {'format': 'date-time',
+                                                     'info': {'type': 'string'},
+                                                     'since': {'format': 'date-time',
                                                                'type': 'string'},
-                                                     'Status': {'type': 'string'}},
-                                      'required': ['Status',
-                                                   'Info',
-                                                   'Data',
-                                                   'Since'],
+                                                     'status': {'type': 'string'}},
+                                      'required': ['status', 'info', 'since'],
                                       'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
+                     'MachineHardware': {'additionalProperties': False,
+                                         'properties': {'arch': {'type': 'string'},
+                                                        'availability-zone': {'type': 'string'},
+                                                        'cores': {'type': 'integer'},
+                                                        'cpu-power': {'type': 'integer'},
+                                                        'mem': {'type': 'integer'},
+                                                        'root-disk': {'type': 'integer'},
+                                                        'tags': {'items': {'type': 'string'},
+                                                                 'type': 'array'}},
+                                         'type': 'object'},
+                     'MapResult': {'additionalProperties': False,
+                                   'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                  'result': {'patternProperties': {'.*': {'additionalProperties': True,
+                                                                                          'type': 'object'}},
+                                                             'type': 'object'}},
+                                   'required': ['result'],
+                                   'type': 'object'},
+                     'MapResults': {'additionalProperties': False,
+                                    'properties': {'results': {'items': {'$ref': '#/definitions/MapResult'},
+                                                               'type': 'array'}},
+                                    'required': ['results'],
+                                    'type': 'object'},
                      'Model': {'additionalProperties': False,
-                               'properties': {'Name': {'type': 'string'},
-                                              'OwnerTag': {'type': 'string'},
-                                              'UUID': {'type': 'string'}},
-                               'required': ['Name', 'UUID', 'OwnerTag'],
+                               'properties': {'name': {'type': 'string'},
+                                              'owner-tag': {'type': 'string'},
+                                              'uuid': {'type': 'string'}},
+                               'required': ['name', 'uuid', 'owner-tag'],
                                'type': 'object'},
-                     'ModelConfigResult': {'additionalProperties': False,
-                                           'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True,
-                                                                                                  'type': 'object'}},
-                                                                     'type': 'object'}},
-                                           'required': ['Config'],
-                                           'type': 'object'},
                      'ModelCreateArgs': {'additionalProperties': False,
-                                         'properties': {'Account': {'patternProperties': {'.*': {'additionalProperties': True,
-                                                                                                 'type': 'object'}},
-                                                                    'type': 'object'},
-                                                        'Config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                         'properties': {'cloud-tag': {'type': 'string'},
+                                                        'config': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                 'type': 'object'}},
                                                                    'type': 'object'},
-                                                        'OwnerTag': {'type': 'string'}},
-                                         'required': ['OwnerTag',
-                                                      'Account',
-                                                      'Config'],
+                                                        'credential': {'type': 'string'},
+                                                        'name': {'type': 'string'},
+                                                        'owner-tag': {'type': 'string'},
+                                                        'region': {'type': 'string'}},
+                                         'required': ['name', 'owner-tag'],
                                          'type': 'object'},
+                     'ModelDefaultValues': {'additionalProperties': False,
+                                            'properties': {'cloud-region': {'type': 'string'},
+                                                           'cloud-tag': {'type': 'string'},
+                                                           'config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                                                                                   'type': 'object'}},
+                                                                      'type': 'object'}},
+                                            'required': ['config'],
+                                            'type': 'object'},
+                     'ModelDefaults': {'additionalProperties': False,
+                                       'properties': {'controller': {'additionalProperties': True,
+                                                                     'type': 'object'},
+                                                      'default': {'additionalProperties': True,
+                                                                  'type': 'object'},
+                                                      'regions': {'items': {'$ref': '#/definitions/RegionDefaults'},
+                                                                  'type': 'array'}},
+                                       'type': 'object'},
+                     'ModelDefaultsResult': {'additionalProperties': False,
+                                             'properties': {'config': {'patternProperties': {'.*': {'$ref': '#/definitions/ModelDefaults'}},
+                                                                       'type': 'object'}},
+                                             'required': ['config'],
+                                             'type': 'object'},
                      'ModelInfo': {'additionalProperties': False,
-                                   'properties': {'Cloud': {'type': 'string'},
-                                                  'DefaultSeries': {'type': 'string'},
-                                                  'Life': {'type': 'string'},
-                                                  'Name': {'type': 'string'},
-                                                  'OwnerTag': {'type': 'string'},
-                                                  'ProviderType': {'type': 'string'},
-                                                  'ServerUUID': {'type': 'string'},
-                                                  'Status': {'$ref': '#/definitions/EntityStatus'},
-                                                  'UUID': {'type': 'string'},
-                                                  'Users': {'items': {'$ref': '#/definitions/ModelUserInfo'},
-                                                            'type': 'array'}},
-                                   'required': ['Name',
-                                                'UUID',
-                                                'ServerUUID',
-                                                'ProviderType',
-                                                'DefaultSeries',
-                                                'Cloud',
-                                                'OwnerTag',
-                                                'Life',
-                                                'Status',
-                                                'Users'],
+                                   'properties': {'cloud-credential-tag': {'type': 'string'},
+                                                  'cloud-region': {'type': 'string'},
+                                                  'cloud-tag': {'type': 'string'},
+                                                  'controller-uuid': {'type': 'string'},
+                                                  'default-series': {'type': 'string'},
+                                                  'life': {'type': 'string'},
+                                                  'machines': {'items': {'$ref': '#/definitions/ModelMachineInfo'},
+                                                               'type': 'array'},
+                                                  'name': {'type': 'string'},
+                                                  'owner-tag': {'type': 'string'},
+                                                  'provider-type': {'type': 'string'},
+                                                  'status': {'$ref': '#/definitions/EntityStatus'},
+                                                  'users': {'items': {'$ref': '#/definitions/ModelUserInfo'},
+                                                            'type': 'array'},
+                                                  'uuid': {'type': 'string'}},
+                                   'required': ['name',
+                                                'uuid',
+                                                'controller-uuid',
+                                                'provider-type',
+                                                'default-series',
+                                                'cloud-tag',
+                                                'owner-tag',
+                                                'life',
+                                                'status',
+                                                'users',
+                                                'machines'],
                                    'type': 'object'},
                      'ModelInfoResult': {'additionalProperties': False,
                                          'properties': {'error': {'$ref': '#/definitions/Error'},
@@ -13754,20 +15013,50 @@ class ModelManagerFacade(Type):
                                                                      'type': 'array'}},
                                           'required': ['results'],
                                           'type': 'object'},
-                     'ModelSkeletonConfigArgs': {'additionalProperties': False,
-                                                 'properties': {'Provider': {'type': 'string'},
-                                                                'Region': {'type': 'string'}},
-                                                 'required': ['Provider', 'Region'],
-                                                 'type': 'object'},
+                     'ModelMachineInfo': {'additionalProperties': False,
+                                          'properties': {'hardware': {'$ref': '#/definitions/MachineHardware'},
+                                                         'has-vote': {'type': 'boolean'},
+                                                         'id': {'type': 'string'},
+                                                         'instance-id': {'type': 'string'},
+                                                         'status': {'type': 'string'},
+                                                         'wants-vote': {'type': 'boolean'}},
+                                          'required': ['id'],
+                                          'type': 'object'},
+                     'ModelStatus': {'additionalProperties': False,
+                                     'properties': {'application-count': {'type': 'integer'},
+                                                    'hosted-machine-count': {'type': 'integer'},
+                                                    'life': {'type': 'string'},
+                                                    'machines': {'items': {'$ref': '#/definitions/ModelMachineInfo'},
+                                                                 'type': 'array'},
+                                                    'model-tag': {'type': 'string'},
+                                                    'owner-tag': {'type': 'string'}},
+                                     'required': ['model-tag',
+                                                  'life',
+                                                  'hosted-machine-count',
+                                                  'application-count',
+                                                  'owner-tag'],
+                                     'type': 'object'},
+                     'ModelStatusResults': {'additionalProperties': False,
+                                            'properties': {'models': {'items': {'$ref': '#/definitions/ModelStatus'},
+                                                                      'type': 'array'}},
+                                            'required': ['models'],
+                                            'type': 'object'},
+                     'ModelUnsetKeys': {'additionalProperties': False,
+                                        'properties': {'cloud-region': {'type': 'string'},
+                                                       'cloud-tag': {'type': 'string'},
+                                                       'keys': {'items': {'type': 'string'},
+                                                                'type': 'array'}},
+                                        'required': ['keys'],
+                                        'type': 'object'},
                      'ModelUserInfo': {'additionalProperties': False,
                                        'properties': {'access': {'type': 'string'},
-                                                      'displayname': {'type': 'string'},
-                                                      'lastconnection': {'format': 'date-time',
-                                                                         'type': 'string'},
+                                                      'display-name': {'type': 'string'},
+                                                      'last-connection': {'format': 'date-time',
+                                                                          'type': 'string'},
                                                       'user': {'type': 'string'}},
                                        'required': ['user',
-                                                    'displayname',
-                                                    'lastconnection',
+                                                    'display-name',
+                                                    'last-connection',
                                                     'access'],
                                        'type': 'object'},
                      'ModifyModelAccess': {'additionalProperties': False,
@@ -13785,80 +15074,133 @@ class ModelManagerFacade(Type):
                                                                              'type': 'array'}},
                                                   'required': ['changes'],
                                                   'type': 'object'},
+                     'RegionDefaults': {'additionalProperties': False,
+                                        'properties': {'region-name': {'type': 'string'},
+                                                       'value': {'additionalProperties': True,
+                                                                 'type': 'object'}},
+                                        'required': ['region-name', 'value'],
+                                        'type': 'object'},
+                     'SetModelDefaults': {'additionalProperties': False,
+                                          'properties': {'config': {'items': {'$ref': '#/definitions/ModelDefaultValues'},
+                                                                    'type': 'array'}},
+                                          'required': ['config'],
+                                          'type': 'object'},
+                     'UnsetModelDefaults': {'additionalProperties': False,
+                                            'properties': {'keys': {'items': {'$ref': '#/definitions/ModelUnsetKeys'},
+                                                                    'type': 'array'}},
+                                            'required': ['keys'],
+                                            'type': 'object'},
                      'UserModel': {'additionalProperties': False,
-                                   'properties': {'LastConnection': {'format': 'date-time',
-                                                                     'type': 'string'},
-                                                  'Model': {'$ref': '#/definitions/Model'}},
-                                   'required': ['Model', 'LastConnection'],
+                                   'properties': {'last-connection': {'format': 'date-time',
+                                                                      'type': 'string'},
+                                                  'model': {'$ref': '#/definitions/Model'}},
+                                   'required': ['model', 'last-connection'],
                                    'type': 'object'},
                      'UserModelList': {'additionalProperties': False,
-                                       'properties': {'UserModels': {'items': {'$ref': '#/definitions/UserModel'},
-                                                                     'type': 'array'}},
-                                       'required': ['UserModels'],
-                                       'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
-     'properties': {'ConfigSkeleton': {'properties': {'Params': {'$ref': '#/definitions/ModelSkeletonConfigArgs'},
-                                                      'Result': {'$ref': '#/definitions/ModelConfigResult'}},
-                                       'type': 'object'},
-                    'CreateModel': {'properties': {'Params': {'$ref': '#/definitions/ModelCreateArgs'},
-                                                   'Result': {'$ref': '#/definitions/Model'}},
+                                       'properties': {'user-models': {'items': {'$ref': '#/definitions/UserModel'},
+                                                                      'type': 'array'}},
+                                       'required': ['user-models'],
+                                       'type': 'object'}},
+     'properties': {'CreateModel': {'properties': {'Params': {'$ref': '#/definitions/ModelCreateArgs'},
+                                                   'Result': {'$ref': '#/definitions/ModelInfo'}},
                                     'type': 'object'},
+                    'DestroyModels': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                     'Result': {'$ref': '#/definitions/ErrorResults'}},
+                                      'type': 'object'},
+                    'DumpModels': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                  'Result': {'$ref': '#/definitions/MapResults'}},
+                                   'type': 'object'},
+                    'DumpModelsDB': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                    'Result': {'$ref': '#/definitions/MapResults'}},
+                                     'type': 'object'},
                     'ListModels': {'properties': {'Params': {'$ref': '#/definitions/Entity'},
                                                   'Result': {'$ref': '#/definitions/UserModelList'}},
                                    'type': 'object'},
+                    'ModelDefaults': {'properties': {'Result': {'$ref': '#/definitions/ModelDefaultsResult'}},
+                                      'type': 'object'},
                     'ModelInfo': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                  'Result': {'$ref': '#/definitions/ModelInfoResults'}},
                                   'type': 'object'},
+                    'ModelStatus': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                   'Result': {'$ref': '#/definitions/ModelStatusResults'}},
+                                    'type': 'object'},
                     'ModifyModelAccess': {'properties': {'Params': {'$ref': '#/definitions/ModifyModelAccessRequest'},
                                                          'Result': {'$ref': '#/definitions/ErrorResults'}},
-                                          'type': 'object'}},
+                                          'type': 'object'},
+                    'SetModelDefaults': {'properties': {'Params': {'$ref': '#/definitions/SetModelDefaults'},
+                                                        'Result': {'$ref': '#/definitions/ErrorResults'}},
+                                         'type': 'object'},
+                    'UnsetModelDefaults': {'properties': {'Params': {'$ref': '#/definitions/UnsetModelDefaults'},
+                                                          'Result': {'$ref': '#/definitions/ErrorResults'}},
+                                           'type': 'object'}},
      'type': 'object'}
     
 
-    @ReturnMapping(ModelConfigResult)
-    async def ConfigSkeleton(self, provider, region):
+    @ReturnMapping(ModelInfo)
+    async def CreateModel(self, cloud_tag, config, credential, name, owner_tag, region):
         '''
-        provider : str
+        cloud_tag : str
+        config : typing.Mapping<~KT, +VT_co>[str, typing.Any]
+        credential : str
+        name : str
+        owner_tag : str
         region : str
-        Returns -> typing.Mapping[str, typing.Any]
+        Returns -> typing.Union[_ForwardRef('EntityStatus'), typing.Sequence<+T_co>[~ModelUserInfo]<~ModelUserInfo>]
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='ModelManager', request='CreateModel', version=2, params=_params)
+        _params['cloud-tag'] = cloud_tag
+        _params['config'] = config
+        _params['credential'] = credential
+        _params['name'] = name
+        _params['owner-tag'] = owner_tag
+        _params['region'] = region
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(ErrorResults)
+    async def DestroyModels(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='ModelManager', request='DestroyModels', version=2, params=_params)
+        _params['entities'] = entities
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(MapResults)
+    async def DumpModels(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~MapResult]<~MapResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='ModelManager', Request='ConfigSkeleton', Version=2, Params=params)
-        params['Provider'] = provider
-        params['Region'] = region
+        _params = dict()
+        msg = dict(type='ModelManager', request='DumpModels', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
-    @ReturnMapping(Model)
-    async def CreateModel(self, account, config, ownertag):
+    @ReturnMapping(MapResults)
+    async def DumpModelsDB(self, entities):
         '''
-        account : typing.Mapping[str, typing.Any]
-        config : typing.Mapping[str, typing.Any]
-        ownertag : str
-        Returns -> <class 'str'>
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~MapResult]<~MapResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='ModelManager', Request='CreateModel', Version=2, Params=params)
-        params['Account'] = account
-        params['Config'] = config
-        params['OwnerTag'] = ownertag
+        _params = dict()
+        msg = dict(type='ModelManager', request='DumpModelsDB', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -13868,12 +15210,27 @@ class ModelManagerFacade(Type):
     async def ListModels(self, tag):
         '''
         tag : str
-        Returns -> typing.Sequence[~UserModel]
+        Returns -> typing.Sequence<+T_co>[~UserModel]<~UserModel>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='ModelManager', request='ListModels', version=2, params=_params)
+        _params['tag'] = tag
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(ModelDefaultsResult)
+    async def ModelDefaults(self):
+        '''
+
+        Returns -> typing.Mapping<~KT, +VT_co>[str, ~ModelDefaults]<~ModelDefaults>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='ModelManager', Request='ListModels', Version=2, Params=params)
-        params['Tag'] = tag
+        _params = dict()
+        msg = dict(type='ModelManager', request='ModelDefaults', version=2, params=_params)
+
         reply = await self.rpc(msg)
         return reply
 
@@ -13882,13 +15239,28 @@ class ModelManagerFacade(Type):
     @ReturnMapping(ModelInfoResults)
     async def ModelInfo(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ModelInfoResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ModelInfoResult]<~ModelInfoResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='ModelManager', Request='ModelInfo', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='ModelManager', request='ModelInfo', version=2, params=_params)
+        _params['entities'] = entities
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(ModelStatusResults)
+    async def ModelStatus(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ModelStatus]<~ModelStatus>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='ModelManager', request='ModelStatus', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -13897,13 +15269,43 @@ class ModelManagerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def ModifyModelAccess(self, changes):
         '''
-        changes : typing.Sequence[~ModifyModelAccess]
-        Returns -> typing.Sequence[~ErrorResult]
+        changes : typing.Sequence<+T_co>[~ModifyModelAccess]<~ModifyModelAccess>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='ModelManager', request='ModifyModelAccess', version=2, params=_params)
+        _params['changes'] = changes
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(ErrorResults)
+    async def SetModelDefaults(self, config):
+        '''
+        config : typing.Sequence<+T_co>[~ModelDefaultValues]<~ModelDefaultValues>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='ModelManager', request='SetModelDefaults', version=2, params=_params)
+        _params['config'] = config
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(ErrorResults)
+    async def UnsetModelDefaults(self, keys):
+        '''
+        keys : typing.Sequence<+T_co>[~ModelUnsetKeys]<~ModelUnsetKeys>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='ModelManager', Request='ModifyModelAccess', Version=2, Params=params)
-        params['changes'] = changes
+        _params = dict()
+        msg = dict(type='ModelManager', request='UnsetModelDefaults', version=2, params=_params)
+        _params['keys'] = keys
         reply = await self.rpc(msg)
         return reply
 
@@ -13922,8 +15324,8 @@ class NotifyWatcherFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='NotifyWatcher', Request='Next', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='NotifyWatcher', request='Next', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -13937,8 +15339,8 @@ class NotifyWatcherFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='NotifyWatcher', Request='Stop', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='NotifyWatcher', request='Stop', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -13958,8 +15360,8 @@ class PingerFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Pinger', Request='Ping', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Pinger', request='Ping', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -13973,8 +15375,8 @@ class PingerFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Pinger', Request='Stop', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Pinger', request='Stop', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -13984,17 +15386,17 @@ class ProvisionerFacade(Type):
     name = 'Provisioner'
     version = 3
     schema =     {'definitions': {'APIHostPortsResult': {'additionalProperties': False,
-                                            'properties': {'Servers': {'items': {'items': {'$ref': '#/definitions/HostPort'},
+                                            'properties': {'servers': {'items': {'items': {'$ref': '#/definitions/HostPort'},
                                                                                  'type': 'array'},
                                                                        'type': 'array'}},
-                                            'required': ['Servers'],
+                                            'required': ['servers'],
                                             'type': 'object'},
                      'Address': {'additionalProperties': False,
-                                 'properties': {'Scope': {'type': 'string'},
-                                                'SpaceName': {'type': 'string'},
-                                                'Type': {'type': 'string'},
-                                                'Value': {'type': 'string'}},
-                                 'required': ['Value', 'Type', 'Scope'],
+                                 'properties': {'scope': {'type': 'string'},
+                                                'space-name': {'type': 'string'},
+                                                'type': {'type': 'string'},
+                                                'value': {'type': 'string'}},
+                                 'required': ['value', 'type', 'scope'],
                                  'type': 'object'},
                      'Binary': {'additionalProperties': False,
                                 'properties': {'Arch': {'type': 'string'},
@@ -14003,23 +15405,23 @@ class ProvisionerFacade(Type):
                                 'required': ['Number', 'Series', 'Arch'],
                                 'type': 'object'},
                      'BytesResult': {'additionalProperties': False,
-                                     'properties': {'Result': {'items': {'type': 'integer'},
+                                     'properties': {'result': {'items': {'type': 'integer'},
                                                                'type': 'array'}},
-                                     'required': ['Result'],
+                                     'required': ['result'],
                                      'type': 'object'},
                      'CloudImageMetadata': {'additionalProperties': False,
                                             'properties': {'arch': {'type': 'string'},
-                                                           'image_id': {'type': 'string'},
+                                                           'image-id': {'type': 'string'},
                                                            'priority': {'type': 'integer'},
                                                            'region': {'type': 'string'},
-                                                           'root_storage_size': {'type': 'integer'},
-                                                           'root_storage_type': {'type': 'string'},
+                                                           'root-storage-size': {'type': 'integer'},
+                                                           'root-storage-type': {'type': 'string'},
                                                            'series': {'type': 'string'},
                                                            'source': {'type': 'string'},
                                                            'stream': {'type': 'string'},
                                                            'version': {'type': 'string'},
-                                                           'virt_type': {'type': 'string'}},
-                                            'required': ['image_id',
+                                                           'virt-type': {'type': 'string'}},
+                                            'required': ['image-id',
                                                          'region',
                                                          'version',
                                                          'series',
@@ -14028,256 +15430,245 @@ class ProvisionerFacade(Type):
                                                          'priority'],
                                             'type': 'object'},
                      'ConstraintsResult': {'additionalProperties': False,
-                                           'properties': {'Constraints': {'$ref': '#/definitions/Value'},
-                                                          'Error': {'$ref': '#/definitions/Error'}},
-                                           'required': ['Error', 'Constraints'],
+                                           'properties': {'constraints': {'$ref': '#/definitions/Value'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['constraints'],
                                            'type': 'object'},
                      'ConstraintsResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/ConstraintsResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/ConstraintsResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
+                                            'required': ['results'],
                                             'type': 'object'},
                      'ContainerConfig': {'additionalProperties': False,
-                                         'properties': {'AllowLXCLoopMounts': {'type': 'boolean'},
-                                                        'AptMirror': {'type': 'string'},
-                                                        'AptProxy': {'$ref': '#/definitions/Settings'},
-                                                        'AuthorizedKeys': {'type': 'string'},
-                                                        'ProviderType': {'type': 'string'},
-                                                        'Proxy': {'$ref': '#/definitions/Settings'},
-                                                        'SSLHostnameVerification': {'type': 'boolean'},
-                                                        'UpdateBehavior': {'$ref': '#/definitions/UpdateBehavior'}},
-                                         'required': ['ProviderType',
-                                                      'AuthorizedKeys',
-                                                      'SSLHostnameVerification',
-                                                      'Proxy',
-                                                      'AptProxy',
-                                                      'AptMirror',
-                                                      'AllowLXCLoopMounts',
+                                         'properties': {'UpdateBehavior': {'$ref': '#/definitions/UpdateBehavior'},
+                                                        'apt-mirror': {'type': 'string'},
+                                                        'apt-proxy': {'$ref': '#/definitions/Settings'},
+                                                        'authorized-keys': {'type': 'string'},
+                                                        'provider-type': {'type': 'string'},
+                                                        'proxy': {'$ref': '#/definitions/Settings'},
+                                                        'ssl-hostname-verification': {'type': 'boolean'}},
+                                         'required': ['provider-type',
+                                                      'authorized-keys',
+                                                      'ssl-hostname-verification',
+                                                      'proxy',
+                                                      'apt-proxy',
+                                                      'apt-mirror',
                                                       'UpdateBehavior'],
                                          'type': 'object'},
                      'ContainerManagerConfig': {'additionalProperties': False,
-                                                'properties': {'ManagerConfig': {'patternProperties': {'.*': {'type': 'string'}},
-                                                                                 'type': 'object'}},
-                                                'required': ['ManagerConfig'],
+                                                'properties': {'config': {'patternProperties': {'.*': {'type': 'string'}},
+                                                                          'type': 'object'}},
+                                                'required': ['config'],
                                                 'type': 'object'},
                      'ContainerManagerConfigParams': {'additionalProperties': False,
-                                                      'properties': {'Type': {'type': 'string'}},
-                                                      'required': ['Type'],
+                                                      'properties': {'type': {'type': 'string'}},
+                                                      'required': ['type'],
                                                       'type': 'object'},
+                     'ControllerConfigResult': {'additionalProperties': False,
+                                                'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                                                                                       'type': 'object'}},
+                                                                          'type': 'object'}},
+                                                'required': ['config'],
+                                                'type': 'object'},
                      'DistributionGroupResult': {'additionalProperties': False,
-                                                 'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                                'Result': {'items': {'type': 'string'},
+                                                 'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                                'result': {'items': {'type': 'string'},
                                                                            'type': 'array'}},
-                                                 'required': ['Error', 'Result'],
+                                                 'required': ['result'],
                                                  'type': 'object'},
                      'DistributionGroupResults': {'additionalProperties': False,
-                                                  'properties': {'Results': {'items': {'$ref': '#/definitions/DistributionGroupResult'},
+                                                  'properties': {'results': {'items': {'$ref': '#/definitions/DistributionGroupResult'},
                                                                              'type': 'array'}},
-                                                  'required': ['Results'],
+                                                  'required': ['results'],
                                                   'type': 'object'},
                      'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'EntityPassword': {'additionalProperties': False,
-                                        'properties': {'Password': {'type': 'string'},
-                                                       'Tag': {'type': 'string'}},
-                                        'required': ['Tag', 'Password'],
+                                        'properties': {'password': {'type': 'string'},
+                                                       'tag': {'type': 'string'}},
+                                        'required': ['tag', 'password'],
                                         'type': 'object'},
                      'EntityPasswords': {'additionalProperties': False,
-                                         'properties': {'Changes': {'items': {'$ref': '#/definitions/EntityPassword'},
+                                         'properties': {'changes': {'items': {'$ref': '#/definitions/EntityPassword'},
                                                                     'type': 'array'}},
-                                         'required': ['Changes'],
+                                         'required': ['changes'],
                                          'type': 'object'},
                      'EntityStatusArgs': {'additionalProperties': False,
-                                          'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True,
+                                          'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                'type': 'object'}},
                                                                   'type': 'object'},
-                                                         'Info': {'type': 'string'},
-                                                         'Status': {'type': 'string'},
-                                                         'Tag': {'type': 'string'}},
-                                          'required': ['Tag',
-                                                       'Status',
-                                                       'Info',
-                                                       'Data'],
+                                                         'info': {'type': 'string'},
+                                                         'status': {'type': 'string'},
+                                                         'tag': {'type': 'string'}},
+                                          'required': ['tag',
+                                                       'status',
+                                                       'info',
+                                                       'data'],
                                           'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'FindToolsParams': {'additionalProperties': False,
-                                         'properties': {'Arch': {'type': 'string'},
-                                                        'MajorVersion': {'type': 'integer'},
-                                                        'MinorVersion': {'type': 'integer'},
-                                                        'Number': {'$ref': '#/definitions/Number'},
-                                                        'Series': {'type': 'string'}},
-                                         'required': ['Number',
-                                                      'MajorVersion',
-                                                      'MinorVersion',
-                                                      'Arch',
-                                                      'Series'],
+                                         'properties': {'arch': {'type': 'string'},
+                                                        'major': {'type': 'integer'},
+                                                        'minor': {'type': 'integer'},
+                                                        'number': {'$ref': '#/definitions/Number'},
+                                                        'series': {'type': 'string'}},
+                                         'required': ['number',
+                                                      'major',
+                                                      'minor',
+                                                      'arch',
+                                                      'series'],
                                          'type': 'object'},
                      'FindToolsResult': {'additionalProperties': False,
-                                         'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                        'List': {'items': {'$ref': '#/definitions/Tools'},
+                                         'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                        'list': {'items': {'$ref': '#/definitions/Tools'},
                                                                  'type': 'array'}},
-                                         'required': ['List', 'Error'],
+                                         'required': ['list'],
                                          'type': 'object'},
                      'HardwareCharacteristics': {'additionalProperties': False,
-                                                 'properties': {'Arch': {'type': 'string'},
-                                                                'AvailabilityZone': {'type': 'string'},
-                                                                'CpuCores': {'type': 'integer'},
-                                                                'CpuPower': {'type': 'integer'},
-                                                                'Mem': {'type': 'integer'},
-                                                                'RootDisk': {'type': 'integer'},
-                                                                'Tags': {'items': {'type': 'string'},
+                                                 'properties': {'arch': {'type': 'string'},
+                                                                'availability-zone': {'type': 'string'},
+                                                                'cpu-cores': {'type': 'integer'},
+                                                                'cpu-power': {'type': 'integer'},
+                                                                'mem': {'type': 'integer'},
+                                                                'root-disk': {'type': 'integer'},
+                                                                'tags': {'items': {'type': 'string'},
                                                                          'type': 'array'}},
                                                  'type': 'object'},
                      'HostPort': {'additionalProperties': False,
                                   'properties': {'Address': {'$ref': '#/definitions/Address'},
-                                                 'Port': {'type': 'integer'}},
-                                  'required': ['Address', 'Port'],
+                                                 'port': {'type': 'integer'}},
+                                  'required': ['Address', 'port'],
                                   'type': 'object'},
                      'InstanceInfo': {'additionalProperties': False,
-                                      'properties': {'Characteristics': {'$ref': '#/definitions/HardwareCharacteristics'},
-                                                     'InstanceId': {'type': 'string'},
-                                                     'NetworkConfig': {'items': {'$ref': '#/definitions/NetworkConfig'},
-                                                                       'type': 'array'},
-                                                     'Nonce': {'type': 'string'},
-                                                     'Tag': {'type': 'string'},
-                                                     'VolumeAttachments': {'patternProperties': {'.*': {'$ref': '#/definitions/VolumeAttachmentInfo'}},
-                                                                           'type': 'object'},
-                                                     'Volumes': {'items': {'$ref': '#/definitions/Volume'},
+                                      'properties': {'characteristics': {'$ref': '#/definitions/HardwareCharacteristics'},
+                                                     'instance-id': {'type': 'string'},
+                                                     'network-config': {'items': {'$ref': '#/definitions/NetworkConfig'},
+                                                                        'type': 'array'},
+                                                     'nonce': {'type': 'string'},
+                                                     'tag': {'type': 'string'},
+                                                     'volume-attachments': {'patternProperties': {'.*': {'$ref': '#/definitions/VolumeAttachmentInfo'}},
+                                                                            'type': 'object'},
+                                                     'volumes': {'items': {'$ref': '#/definitions/Volume'},
                                                                  'type': 'array'}},
-                                      'required': ['Tag',
-                                                   'InstanceId',
-                                                   'Nonce',
-                                                   'Characteristics',
-                                                   'Volumes',
-                                                   'VolumeAttachments',
-                                                   'NetworkConfig'],
+                                      'required': ['tag',
+                                                   'instance-id',
+                                                   'nonce',
+                                                   'characteristics',
+                                                   'volumes',
+                                                   'volume-attachments',
+                                                   'network-config'],
                                       'type': 'object'},
                      'InstancesInfo': {'additionalProperties': False,
-                                       'properties': {'Machines': {'items': {'$ref': '#/definitions/InstanceInfo'},
+                                       'properties': {'machines': {'items': {'$ref': '#/definitions/InstanceInfo'},
                                                                    'type': 'array'}},
-                                       'required': ['Machines'],
+                                       'required': ['machines'],
                                        'type': 'object'},
                      'LifeResult': {'additionalProperties': False,
-                                    'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                   'Life': {'type': 'string'}},
-                                    'required': ['Life', 'Error'],
+                                    'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                   'life': {'type': 'string'}},
+                                    'required': ['life'],
                                     'type': 'object'},
                      'LifeResults': {'additionalProperties': False,
-                                     'properties': {'Results': {'items': {'$ref': '#/definitions/LifeResult'},
+                                     'properties': {'results': {'items': {'$ref': '#/definitions/LifeResult'},
                                                                 'type': 'array'}},
-                                     'required': ['Results'],
+                                     'required': ['results'],
                                      'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'MachineContainers': {'additionalProperties': False,
-                                           'properties': {'ContainerTypes': {'items': {'type': 'string'},
-                                                                             'type': 'array'},
-                                                          'MachineTag': {'type': 'string'}},
-                                           'required': ['MachineTag',
-                                                        'ContainerTypes'],
+                                           'properties': {'container-types': {'items': {'type': 'string'},
+                                                                              'type': 'array'},
+                                                          'machine-tag': {'type': 'string'}},
+                                           'required': ['machine-tag',
+                                                        'container-types'],
                                            'type': 'object'},
                      'MachineContainersParams': {'additionalProperties': False,
-                                                 'properties': {'Params': {'items': {'$ref': '#/definitions/MachineContainers'},
+                                                 'properties': {'params': {'items': {'$ref': '#/definitions/MachineContainers'},
                                                                            'type': 'array'}},
-                                                 'required': ['Params'],
+                                                 'required': ['params'],
                                                  'type': 'object'},
                      'MachineNetworkConfigResult': {'additionalProperties': False,
-                                                    'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                                   'Info': {'items': {'$ref': '#/definitions/NetworkConfig'},
+                                                    'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                                   'info': {'items': {'$ref': '#/definitions/NetworkConfig'},
                                                                             'type': 'array'}},
-                                                    'required': ['Error', 'Info'],
+                                                    'required': ['info'],
                                                     'type': 'object'},
                      'MachineNetworkConfigResults': {'additionalProperties': False,
-                                                     'properties': {'Results': {'items': {'$ref': '#/definitions/MachineNetworkConfigResult'},
+                                                     'properties': {'results': {'items': {'$ref': '#/definitions/MachineNetworkConfigResult'},
                                                                                 'type': 'array'}},
-                                                     'required': ['Results'],
+                                                     'required': ['results'],
                                                      'type': 'object'},
                      'ModelConfigResult': {'additionalProperties': False,
-                                           'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                           'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                   'type': 'object'}},
                                                                      'type': 'object'}},
-                                           'required': ['Config'],
+                                           'required': ['config'],
                                            'type': 'object'},
                      'NetworkConfig': {'additionalProperties': False,
-                                       'properties': {'Address': {'type': 'string'},
-                                                      'CIDR': {'type': 'string'},
-                                                      'ConfigType': {'type': 'string'},
-                                                      'DNSSearchDomains': {'items': {'type': 'string'},
-                                                                           'type': 'array'},
-                                                      'DNSServers': {'items': {'type': 'string'},
-                                                                     'type': 'array'},
-                                                      'DeviceIndex': {'type': 'integer'},
-                                                      'Disabled': {'type': 'boolean'},
-                                                      'GatewayAddress': {'type': 'string'},
-                                                      'InterfaceName': {'type': 'string'},
-                                                      'InterfaceType': {'type': 'string'},
-                                                      'MACAddress': {'type': 'string'},
-                                                      'MTU': {'type': 'integer'},
-                                                      'NoAutoStart': {'type': 'boolean'},
-                                                      'ParentInterfaceName': {'type': 'string'},
-                                                      'ProviderAddressId': {'type': 'string'},
-                                                      'ProviderId': {'type': 'string'},
-                                                      'ProviderSpaceId': {'type': 'string'},
-                                                      'ProviderSubnetId': {'type': 'string'},
-                                                      'ProviderVLANId': {'type': 'string'},
-                                                      'VLANTag': {'type': 'integer'}},
-                                       'required': ['DeviceIndex',
-                                                    'MACAddress',
-                                                    'CIDR',
-                                                    'MTU',
-                                                    'ProviderId',
-                                                    'ProviderSubnetId',
-                                                    'ProviderSpaceId',
-                                                    'ProviderAddressId',
-                                                    'ProviderVLANId',
-                                                    'VLANTag',
-                                                    'InterfaceName',
-                                                    'ParentInterfaceName',
-                                                    'InterfaceType',
-                                                    'Disabled'],
+                                       'properties': {'address': {'type': 'string'},
+                                                      'cidr': {'type': 'string'},
+                                                      'config-type': {'type': 'string'},
+                                                      'device-index': {'type': 'integer'},
+                                                      'disabled': {'type': 'boolean'},
+                                                      'dns-search-domains': {'items': {'type': 'string'},
+                                                                             'type': 'array'},
+                                                      'dns-servers': {'items': {'type': 'string'},
+                                                                      'type': 'array'},
+                                                      'gateway-address': {'type': 'string'},
+                                                      'interface-name': {'type': 'string'},
+                                                      'interface-type': {'type': 'string'},
+                                                      'mac-address': {'type': 'string'},
+                                                      'mtu': {'type': 'integer'},
+                                                      'no-auto-start': {'type': 'boolean'},
+                                                      'parent-interface-name': {'type': 'string'},
+                                                      'provider-address-id': {'type': 'string'},
+                                                      'provider-id': {'type': 'string'},
+                                                      'provider-space-id': {'type': 'string'},
+                                                      'provider-subnet-id': {'type': 'string'},
+                                                      'provider-vlan-id': {'type': 'string'},
+                                                      'vlan-tag': {'type': 'integer'}},
+                                       'required': ['device-index',
+                                                    'mac-address',
+                                                    'cidr',
+                                                    'mtu',
+                                                    'provider-id',
+                                                    'provider-subnet-id',
+                                                    'provider-space-id',
+                                                    'provider-address-id',
+                                                    'provider-vlan-id',
+                                                    'vlan-tag',
+                                                    'interface-name',
+                                                    'parent-interface-name',
+                                                    'interface-type',
+                                                    'disabled'],
                                        'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
                      'Number': {'additionalProperties': False,
                                 'properties': {'Build': {'type': 'integer'},
@@ -14292,46 +15683,44 @@ class ProvisionerFacade(Type):
                                              'Build'],
                                 'type': 'object'},
                      'ProvisioningInfo': {'additionalProperties': False,
-                                          'properties': {'Constraints': {'$ref': '#/definitions/Value'},
-                                                         'EndpointBindings': {'patternProperties': {'.*': {'type': 'string'}},
-                                                                              'type': 'object'},
-                                                         'ImageMetadata': {'items': {'$ref': '#/definitions/CloudImageMetadata'},
-                                                                           'type': 'array'},
-                                                         'Jobs': {'items': {'type': 'string'},
+                                          'properties': {'constraints': {'$ref': '#/definitions/Value'},
+                                                         'controller-config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                                                                                            'type': 'object'}},
+                                                                               'type': 'object'},
+                                                         'endpoint-bindings': {'patternProperties': {'.*': {'type': 'string'}},
+                                                                               'type': 'object'},
+                                                         'image-metadata': {'items': {'$ref': '#/definitions/CloudImageMetadata'},
+                                                                            'type': 'array'},
+                                                         'jobs': {'items': {'type': 'string'},
                                                                   'type': 'array'},
-                                                         'Placement': {'type': 'string'},
-                                                         'Series': {'type': 'string'},
-                                                         'SubnetsToZones': {'patternProperties': {'.*': {'items': {'type': 'string'},
-                                                                                                         'type': 'array'}},
-                                                                            'type': 'object'},
-                                                         'Tags': {'patternProperties': {'.*': {'type': 'string'}},
+                                                         'placement': {'type': 'string'},
+                                                         'series': {'type': 'string'},
+                                                         'subnets-to-zones': {'patternProperties': {'.*': {'items': {'type': 'string'},
+                                                                                                           'type': 'array'}},
+                                                                              'type': 'object'},
+                                                         'tags': {'patternProperties': {'.*': {'type': 'string'}},
                                                                   'type': 'object'},
-                                                         'Volumes': {'items': {'$ref': '#/definitions/VolumeParams'},
+                                                         'volumes': {'items': {'$ref': '#/definitions/VolumeParams'},
                                                                      'type': 'array'}},
-                                          'required': ['Constraints',
-                                                       'Series',
-                                                       'Placement',
-                                                       'Jobs',
-                                                       'Volumes',
-                                                       'Tags',
-                                                       'SubnetsToZones',
-                                                       'ImageMetadata',
-                                                       'EndpointBindings'],
+                                          'required': ['constraints',
+                                                       'series',
+                                                       'placement',
+                                                       'jobs'],
                                           'type': 'object'},
                      'ProvisioningInfoResult': {'additionalProperties': False,
-                                                'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                               'Result': {'$ref': '#/definitions/ProvisioningInfo'}},
-                                                'required': ['Error', 'Result'],
+                                                'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                               'result': {'$ref': '#/definitions/ProvisioningInfo'}},
+                                                'required': ['result'],
                                                 'type': 'object'},
                      'ProvisioningInfoResults': {'additionalProperties': False,
-                                                 'properties': {'Results': {'items': {'$ref': '#/definitions/ProvisioningInfoResult'},
+                                                 'properties': {'results': {'items': {'$ref': '#/definitions/ProvisioningInfoResult'},
                                                                             'type': 'array'}},
-                                                 'required': ['Results'],
+                                                 'required': ['results'],
                                                  'type': 'object'},
                      'SetStatus': {'additionalProperties': False,
-                                   'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'},
+                                   'properties': {'entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'},
                                                                'type': 'array'}},
-                                   'required': ['Entities'],
+                                   'required': ['entities'],
                                    'type': 'object'},
                      'Settings': {'additionalProperties': False,
                                   'properties': {'Ftp': {'type': 'string'},
@@ -14341,58 +15730,54 @@ class ProvisionerFacade(Type):
                                   'required': ['Http', 'Https', 'Ftp', 'NoProxy'],
                                   'type': 'object'},
                      'StatusResult': {'additionalProperties': False,
-                                      'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True,
+                                      'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                            'type': 'object'}},
                                                               'type': 'object'},
-                                                     'Error': {'$ref': '#/definitions/Error'},
-                                                     'Id': {'type': 'string'},
-                                                     'Info': {'type': 'string'},
-                                                     'Life': {'type': 'string'},
-                                                     'Since': {'format': 'date-time',
+                                                     'error': {'$ref': '#/definitions/Error'},
+                                                     'id': {'type': 'string'},
+                                                     'info': {'type': 'string'},
+                                                     'life': {'type': 'string'},
+                                                     'since': {'format': 'date-time',
                                                                'type': 'string'},
-                                                     'Status': {'type': 'string'}},
-                                      'required': ['Error',
-                                                   'Id',
-                                                   'Life',
-                                                   'Status',
-                                                   'Info',
-                                                   'Data',
-                                                   'Since'],
+                                                     'status': {'type': 'string'}},
+                                      'required': ['id',
+                                                   'life',
+                                                   'status',
+                                                   'info',
+                                                   'data',
+                                                   'since'],
                                       'type': 'object'},
                      'StatusResults': {'additionalProperties': False,
-                                       'properties': {'Results': {'items': {'$ref': '#/definitions/StatusResult'},
+                                       'properties': {'results': {'items': {'$ref': '#/definitions/StatusResult'},
                                                                   'type': 'array'}},
-                                       'required': ['Results'],
+                                       'required': ['results'],
                                        'type': 'object'},
                      'StringResult': {'additionalProperties': False,
-                                      'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                     'Result': {'type': 'string'}},
-                                      'required': ['Error', 'Result'],
+                                      'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                     'result': {'type': 'string'}},
+                                      'required': ['result'],
                                       'type': 'object'},
                      'StringResults': {'additionalProperties': False,
-                                       'properties': {'Results': {'items': {'$ref': '#/definitions/StringResult'},
+                                       'properties': {'results': {'items': {'$ref': '#/definitions/StringResult'},
                                                                   'type': 'array'}},
-                                       'required': ['Results'],
+                                       'required': ['results'],
                                        'type': 'object'},
                      'StringsResult': {'additionalProperties': False,
-                                       'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                      'Result': {'items': {'type': 'string'},
+                                       'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                      'result': {'items': {'type': 'string'},
                                                                  'type': 'array'}},
-                                       'required': ['Error', 'Result'],
                                        'type': 'object'},
                      'StringsWatchResult': {'additionalProperties': False,
-                                            'properties': {'Changes': {'items': {'type': 'string'},
+                                            'properties': {'changes': {'items': {'type': 'string'},
                                                                        'type': 'array'},
-                                                           'Error': {'$ref': '#/definitions/Error'},
-                                                           'StringsWatcherId': {'type': 'string'}},
-                                            'required': ['StringsWatcherId',
-                                                         'Changes',
-                                                         'Error'],
+                                                           'error': {'$ref': '#/definitions/Error'},
+                                                           'watcher-id': {'type': 'string'}},
+                                            'required': ['watcher-id'],
                                             'type': 'object'},
                      'StringsWatchResults': {'additionalProperties': False,
-                                             'properties': {'Results': {'items': {'$ref': '#/definitions/StringsWatchResult'},
+                                             'properties': {'results': {'items': {'$ref': '#/definitions/StringsWatchResult'},
                                                                         'type': 'array'}},
-                                             'required': ['Results'],
+                                             'required': ['results'],
                                              'type': 'object'},
                      'Tools': {'additionalProperties': False,
                                'properties': {'sha256': {'type': 'string'},
@@ -14402,29 +15787,28 @@ class ProvisionerFacade(Type):
                                'required': ['version', 'url', 'size'],
                                'type': 'object'},
                      'ToolsResult': {'additionalProperties': False,
-                                     'properties': {'DisableSSLHostnameVerification': {'type': 'boolean'},
-                                                    'Error': {'$ref': '#/definitions/Error'},
-                                                    'ToolsList': {'items': {'$ref': '#/definitions/Tools'},
-                                                                  'type': 'array'}},
-                                     'required': ['ToolsList',
-                                                  'DisableSSLHostnameVerification',
-                                                  'Error'],
+                                     'properties': {'disable-ssl-hostname-verification': {'type': 'boolean'},
+                                                    'error': {'$ref': '#/definitions/Error'},
+                                                    'tools': {'items': {'$ref': '#/definitions/Tools'},
+                                                              'type': 'array'}},
+                                     'required': ['tools',
+                                                  'disable-ssl-hostname-verification'],
                                      'type': 'object'},
                      'ToolsResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ToolsResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ToolsResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'UpdateBehavior': {'additionalProperties': False,
-                                        'properties': {'EnableOSRefreshUpdate': {'type': 'boolean'},
-                                                       'EnableOSUpgrade': {'type': 'boolean'}},
-                                        'required': ['EnableOSRefreshUpdate',
-                                                     'EnableOSUpgrade'],
+                                        'properties': {'enable-os-refresh-update': {'type': 'boolean'},
+                                                       'enable-os-upgrade': {'type': 'boolean'}},
+                                        'required': ['enable-os-refresh-update',
+                                                     'enable-os-upgrade'],
                                         'type': 'object'},
                      'Value': {'additionalProperties': False,
                                'properties': {'arch': {'type': 'string'},
                                               'container': {'type': 'string'},
-                                              'cpu-cores': {'type': 'integer'},
+                                              'cores': {'type': 'integer'},
                                               'cpu-power': {'type': 'integer'},
                                               'instance-type': {'type': 'string'},
                                               'mem': {'type': 'integer'},
@@ -14437,32 +15821,32 @@ class ProvisionerFacade(Type):
                                'type': 'object'},
                      'Volume': {'additionalProperties': False,
                                 'properties': {'info': {'$ref': '#/definitions/VolumeInfo'},
-                                               'volumetag': {'type': 'string'}},
-                                'required': ['volumetag', 'info'],
+                                               'volume-tag': {'type': 'string'}},
+                                'required': ['volume-tag', 'info'],
                                 'type': 'object'},
                      'VolumeAttachmentInfo': {'additionalProperties': False,
-                                              'properties': {'busaddress': {'type': 'string'},
-                                                             'devicelink': {'type': 'string'},
-                                                             'devicename': {'type': 'string'},
+                                              'properties': {'bus-address': {'type': 'string'},
+                                                             'device-link': {'type': 'string'},
+                                                             'device-name': {'type': 'string'},
                                                              'read-only': {'type': 'boolean'}},
                                               'type': 'object'},
                      'VolumeAttachmentParams': {'additionalProperties': False,
-                                                'properties': {'instanceid': {'type': 'string'},
-                                                               'machinetag': {'type': 'string'},
+                                                'properties': {'instance-id': {'type': 'string'},
+                                                               'machine-tag': {'type': 'string'},
                                                                'provider': {'type': 'string'},
                                                                'read-only': {'type': 'boolean'},
-                                                               'volumeid': {'type': 'string'},
-                                                               'volumetag': {'type': 'string'}},
-                                                'required': ['volumetag',
-                                                             'machinetag',
+                                                               'volume-id': {'type': 'string'},
+                                                               'volume-tag': {'type': 'string'}},
+                                                'required': ['volume-tag',
+                                                             'machine-tag',
                                                              'provider'],
                                                 'type': 'object'},
                      'VolumeInfo': {'additionalProperties': False,
-                                    'properties': {'hardwareid': {'type': 'string'},
+                                    'properties': {'hardware-id': {'type': 'string'},
                                                    'persistent': {'type': 'boolean'},
                                                    'size': {'type': 'integer'},
-                                                   'volumeid': {'type': 'string'}},
-                                    'required': ['volumeid', 'size', 'persistent'],
+                                                   'volume-id': {'type': 'string'}},
+                                    'required': ['volume-id', 'size', 'persistent'],
                                     'type': 'object'},
                      'VolumeParams': {'additionalProperties': False,
                                       'properties': {'attachment': {'$ref': '#/definitions/VolumeAttachmentParams'},
@@ -14473,33 +15857,22 @@ class ProvisionerFacade(Type):
                                                      'size': {'type': 'integer'},
                                                      'tags': {'patternProperties': {'.*': {'type': 'string'}},
                                                               'type': 'object'},
-                                                     'volumetag': {'type': 'string'}},
-                                      'required': ['volumetag', 'size', 'provider'],
+                                                     'volume-tag': {'type': 'string'}},
+                                      'required': ['volume-tag',
+                                                   'size',
+                                                   'provider'],
                                       'type': 'object'},
                      'WatchContainer': {'additionalProperties': False,
-                                        'properties': {'ContainerType': {'type': 'string'},
-                                                       'MachineTag': {'type': 'string'}},
-                                        'required': ['MachineTag', 'ContainerType'],
+                                        'properties': {'container-type': {'type': 'string'},
+                                                       'machine-tag': {'type': 'string'}},
+                                        'required': ['machine-tag',
+                                                     'container-type'],
                                         'type': 'object'},
                      'WatchContainers': {'additionalProperties': False,
-                                         'properties': {'Params': {'items': {'$ref': '#/definitions/WatchContainer'},
+                                         'properties': {'params': {'items': {'$ref': '#/definitions/WatchContainer'},
                                                                    'type': 'array'}},
-                                         'required': ['Params'],
-                                         'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                         'required': ['params'],
+                                         'type': 'object'}},
      'properties': {'APIAddresses': {'properties': {'Result': {'$ref': '#/definitions/StringsResult'}},
                                      'type': 'object'},
                     'APIHostPorts': {'properties': {'Result': {'$ref': '#/definitions/APIHostPortsResult'}},
@@ -14514,6 +15887,8 @@ class ProvisionerFacade(Type):
                     'ContainerManagerConfig': {'properties': {'Params': {'$ref': '#/definitions/ContainerManagerConfigParams'},
                                                               'Result': {'$ref': '#/definitions/ContainerManagerConfig'}},
                                                'type': 'object'},
+                    'ControllerConfig': {'properties': {'Result': {'$ref': '#/definitions/ControllerConfigResult'}},
+                                         'type': 'object'},
                     'DistributionGroup': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                          'Result': {'$ref': '#/definitions/DistributionGroupResults'}},
                                           'type': 'object'},
@@ -14537,6 +15912,9 @@ class ProvisionerFacade(Type):
                              'type': 'object'},
                     'MachinesWithTransientErrors': {'properties': {'Result': {'$ref': '#/definitions/StatusResults'}},
                                                     'type': 'object'},
+                    'MarkMachinesForRemoval': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                              'Result': {'$ref': '#/definitions/ErrorResults'}},
+                                               'type': 'object'},
                     'ModelConfig': {'properties': {'Result': {'$ref': '#/definitions/ModelConfigResult'}},
                                     'type': 'object'},
                     'ModelUUID': {'properties': {'Result': {'$ref': '#/definitions/StringResult'}},
@@ -14603,11 +15981,11 @@ class ProvisionerFacade(Type):
     async def APIAddresses(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence[str]]
+        Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence<+T_co>[str]]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='APIAddresses', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='Provisioner', request='APIAddresses', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -14618,11 +15996,11 @@ class ProvisionerFacade(Type):
     async def APIHostPorts(self):
         '''
 
-        Returns -> typing.Sequence[~HostPort]
+        Returns -> typing.Sequence<+T_co>[~HostPort]<~HostPort>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='APIHostPorts', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='Provisioner', request='APIHostPorts', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -14633,11 +16011,11 @@ class ProvisionerFacade(Type):
     async def CACert(self):
         '''
 
-        Returns -> typing.Sequence[int]
+        Returns -> typing.Sequence<+T_co>[int]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='CACert', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='Provisioner', request='CACert', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -14647,13 +16025,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(ConstraintsResults)
     async def Constraints(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ConstraintsResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ConstraintsResult]<~ConstraintsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='Constraints', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='Constraints', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -14663,11 +16041,11 @@ class ProvisionerFacade(Type):
     async def ContainerConfig(self):
         '''
 
-        Returns -> typing.Union[bool, str, _ForwardRef('Settings'), _ForwardRef('Settings'), _ForwardRef('UpdateBehavior')]
+        Returns -> typing.Union[_ForwardRef('UpdateBehavior'), str, _ForwardRef('Settings'), _ForwardRef('Settings'), bool]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='ContainerConfig', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='Provisioner', request='ContainerConfig', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -14678,12 +16056,27 @@ class ProvisionerFacade(Type):
     async def ContainerManagerConfig(self, type_):
         '''
         type_ : str
-        Returns -> typing.Mapping[str, str]
+        Returns -> typing.Mapping<~KT, +VT_co>[str, str]
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Provisioner', request='ContainerManagerConfig', version=3, params=_params)
+        _params['type'] = type_
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(ControllerConfigResult)
+    async def ControllerConfig(self):
+        '''
+
+        Returns -> typing.Mapping<~KT, +VT_co>[str, typing.Any]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='ContainerManagerConfig', Version=3, Params=params)
-        params['Type'] = type_
+        _params = dict()
+        msg = dict(type='Provisioner', request='ControllerConfig', version=3, params=_params)
+
         reply = await self.rpc(msg)
         return reply
 
@@ -14692,13 +16085,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(DistributionGroupResults)
     async def DistributionGroup(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~DistributionGroupResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~DistributionGroupResult]<~DistributionGroupResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='DistributionGroup', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='DistributionGroup', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -14707,36 +16100,36 @@ class ProvisionerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def EnsureDead(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='EnsureDead', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='EnsureDead', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(FindToolsResult)
-    async def FindTools(self, arch, majorversion, minorversion, number, series):
+    async def FindTools(self, arch, major, minor, number, series):
         '''
         arch : str
-        majorversion : int
-        minorversion : int
+        major : int
+        minor : int
         number : Number
         series : str
-        Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence[~Tools]]
+        Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence<+T_co>[~Tools]<~Tools>]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='FindTools', Version=3, Params=params)
-        params['Arch'] = arch
-        params['MajorVersion'] = majorversion
-        params['MinorVersion'] = minorversion
-        params['Number'] = number
-        params['Series'] = series
+        _params = dict()
+        msg = dict(type='Provisioner', request='FindTools', version=3, params=_params)
+        _params['arch'] = arch
+        _params['major'] = major
+        _params['minor'] = minor
+        _params['number'] = number
+        _params['series'] = series
         reply = await self.rpc(msg)
         return reply
 
@@ -14745,13 +16138,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(MachineNetworkConfigResults)
     async def GetContainerInterfaceInfo(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~MachineNetworkConfigResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~MachineNetworkConfigResult]<~MachineNetworkConfigResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='GetContainerInterfaceInfo', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='GetContainerInterfaceInfo', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -14760,13 +16153,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(StringResults)
     async def InstanceId(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringResult]<~StringResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='InstanceId', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='InstanceId', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -14775,13 +16168,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(StatusResults)
     async def InstanceStatus(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StatusResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StatusResult]<~StatusResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='InstanceStatus', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='InstanceStatus', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -14790,13 +16183,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(LifeResults)
     async def Life(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~LifeResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~LifeResult]<~LifeResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='Life', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='Life', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -14806,12 +16199,27 @@ class ProvisionerFacade(Type):
     async def MachinesWithTransientErrors(self):
         '''
 
-        Returns -> typing.Sequence[~StatusResult]
+        Returns -> typing.Sequence<+T_co>[~StatusResult]<~StatusResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='MachinesWithTransientErrors', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='Provisioner', request='MachinesWithTransientErrors', version=3, params=_params)
+
+        reply = await self.rpc(msg)
+        return reply
+
+
 
+    @ReturnMapping(ErrorResults)
+    async def MarkMachinesForRemoval(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Provisioner', request='MarkMachinesForRemoval', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -14821,11 +16229,11 @@ class ProvisionerFacade(Type):
     async def ModelConfig(self):
         '''
 
-        Returns -> typing.Mapping[str, typing.Any]
+        Returns -> typing.Mapping<~KT, +VT_co>[str, typing.Any]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='ModelConfig', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='Provisioner', request='ModelConfig', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -14839,8 +16247,8 @@ class ProvisionerFacade(Type):
         Returns -> typing.Union[_ForwardRef('Error'), str]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='ModelUUID', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='Provisioner', request='ModelUUID', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -14850,13 +16258,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(MachineNetworkConfigResults)
     async def PrepareContainerInterfaceInfo(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~MachineNetworkConfigResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~MachineNetworkConfigResult]<~MachineNetworkConfigResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='PrepareContainerInterfaceInfo', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='PrepareContainerInterfaceInfo', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -14865,13 +16273,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(ProvisioningInfoResults)
     async def ProvisioningInfo(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ProvisioningInfoResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ProvisioningInfoResult]<~ProvisioningInfoResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='ProvisioningInfo', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='ProvisioningInfo', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -14880,13 +16288,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def ReleaseContainerAddresses(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='ReleaseContainerAddresses', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='ReleaseContainerAddresses', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -14895,13 +16303,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def Remove(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='Remove', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='Remove', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -14910,13 +16318,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(StringResults)
     async def Series(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringResult]<~StringResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='Series', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='Series', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -14925,13 +16333,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetInstanceInfo(self, machines):
         '''
-        machines : typing.Sequence[~InstanceInfo]
-        Returns -> typing.Sequence[~ErrorResult]
+        machines : typing.Sequence<+T_co>[~InstanceInfo]<~InstanceInfo>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='SetInstanceInfo', Version=3, Params=params)
-        params['Machines'] = machines
+        _params = dict()
+        msg = dict(type='Provisioner', request='SetInstanceInfo', version=3, params=_params)
+        _params['machines'] = machines
         reply = await self.rpc(msg)
         return reply
 
@@ -14940,13 +16348,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetInstanceStatus(self, entities):
         '''
-        entities : typing.Sequence[~EntityStatusArgs]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='SetInstanceStatus', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='SetInstanceStatus', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -14955,13 +16363,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetPasswords(self, changes):
         '''
-        changes : typing.Sequence[~EntityPassword]
-        Returns -> typing.Sequence[~ErrorResult]
+        changes : typing.Sequence<+T_co>[~EntityPassword]<~EntityPassword>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='SetPasswords', Version=3, Params=params)
-        params['Changes'] = changes
+        _params = dict()
+        msg = dict(type='Provisioner', request='SetPasswords', version=3, params=_params)
+        _params['changes'] = changes
         reply = await self.rpc(msg)
         return reply
 
@@ -14970,13 +16378,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetStatus(self, entities):
         '''
-        entities : typing.Sequence[~EntityStatusArgs]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='SetStatus', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='SetStatus', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -14985,13 +16393,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetSupportedContainers(self, params):
         '''
-        params : typing.Sequence[~MachineContainers]
-        Returns -> typing.Sequence[~ErrorResult]
+        params : typing.Sequence<+T_co>[~MachineContainers]<~MachineContainers>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='SetSupportedContainers', Version=3, Params=params)
-        params['Params'] = params
+        _params = dict()
+        msg = dict(type='Provisioner', request='SetSupportedContainers', version=3, params=_params)
+        _params['params'] = params
         reply = await self.rpc(msg)
         return reply
 
@@ -15001,11 +16409,11 @@ class ProvisionerFacade(Type):
     async def StateAddresses(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence[str]]
+        Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence<+T_co>[str]]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='StateAddresses', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='Provisioner', request='StateAddresses', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -15015,13 +16423,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(StatusResults)
     async def Status(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StatusResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StatusResult]<~StatusResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='Status', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='Status', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -15030,13 +16438,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(ToolsResults)
     async def Tools(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ToolsResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ToolsResult]<~ToolsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='Tools', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='Tools', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -15045,13 +16453,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def UpdateStatus(self, entities):
         '''
-        entities : typing.Sequence[~EntityStatusArgs]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='UpdateStatus', Version=3, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Provisioner', request='UpdateStatus', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -15061,11 +16469,11 @@ class ProvisionerFacade(Type):
     async def WatchAPIHostPorts(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), str]
+        Returns -> typing.Union[str, _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='WatchAPIHostPorts', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='Provisioner', request='WatchAPIHostPorts', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -15075,13 +16483,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(StringsWatchResults)
     async def WatchAllContainers(self, params):
         '''
-        params : typing.Sequence[~WatchContainer]
-        Returns -> typing.Sequence[~StringsWatchResult]
+        params : typing.Sequence<+T_co>[~WatchContainer]<~WatchContainer>
+        Returns -> typing.Sequence<+T_co>[~StringsWatchResult]<~StringsWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='WatchAllContainers', Version=3, Params=params)
-        params['Params'] = params
+        _params = dict()
+        msg = dict(type='Provisioner', request='WatchAllContainers', version=3, params=_params)
+        _params['params'] = params
         reply = await self.rpc(msg)
         return reply
 
@@ -15090,13 +16498,13 @@ class ProvisionerFacade(Type):
     @ReturnMapping(StringsWatchResults)
     async def WatchContainers(self, params):
         '''
-        params : typing.Sequence[~WatchContainer]
-        Returns -> typing.Sequence[~StringsWatchResult]
+        params : typing.Sequence<+T_co>[~WatchContainer]<~WatchContainer>
+        Returns -> typing.Sequence<+T_co>[~StringsWatchResult]<~StringsWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='WatchContainers', Version=3, Params=params)
-        params['Params'] = params
+        _params = dict()
+        msg = dict(type='Provisioner', request='WatchContainers', version=3, params=_params)
+        _params['params'] = params
         reply = await self.rpc(msg)
         return reply
 
@@ -15106,11 +16514,11 @@ class ProvisionerFacade(Type):
     async def WatchForModelConfigChanges(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), str]
+        Returns -> typing.Union[str, _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='WatchForModelConfigChanges', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='Provisioner', request='WatchForModelConfigChanges', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -15121,11 +16529,11 @@ class ProvisionerFacade(Type):
     async def WatchMachineErrorRetry(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), str]
+        Returns -> typing.Union[str, _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='WatchMachineErrorRetry', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='Provisioner', request='WatchMachineErrorRetry', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -15136,11 +16544,11 @@ class ProvisionerFacade(Type):
     async def WatchModelMachines(self):
         '''
 
-        Returns -> typing.Union[typing.Sequence[str], _ForwardRef('Error')]
+        Returns -> typing.Union[typing.Sequence<+T_co>[str], _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Provisioner', Request='WatchModelMachines', Version=3, Params=params)
+        _params = dict()
+        msg = dict(type='Provisioner', request='WatchModelMachines', version=3, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -15150,85 +16558,57 @@ class ProxyUpdaterFacade(Type):
     name = 'ProxyUpdater'
     version = 1
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
                      'NotifyWatchResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
+                                            'required': ['results'],
                                             'type': 'object'},
                      'ProxyConfig': {'additionalProperties': False,
-                                     'properties': {'FTP': {'type': 'string'},
-                                                    'HTTP': {'type': 'string'},
-                                                    'HTTPS': {'type': 'string'},
-                                                    'NoProxy': {'type': 'string'}},
-                                     'required': ['HTTP',
-                                                  'HTTPS',
-                                                  'FTP',
-                                                  'NoProxy'],
+                                     'properties': {'ftp': {'type': 'string'},
+                                                    'http': {'type': 'string'},
+                                                    'https': {'type': 'string'},
+                                                    'no-proxy': {'type': 'string'}},
+                                     'required': ['http',
+                                                  'https',
+                                                  'ftp',
+                                                  'no-proxy'],
                                      'type': 'object'},
                      'ProxyConfigResult': {'additionalProperties': False,
-                                           'properties': {'APTProxySettings': {'$ref': '#/definitions/ProxyConfig'},
-                                                          'Error': {'$ref': '#/definitions/Error'},
-                                                          'ProxySettings': {'$ref': '#/definitions/ProxyConfig'}},
-                                           'required': ['ProxySettings',
-                                                        'APTProxySettings'],
+                                           'properties': {'apt-proxy-settings': {'$ref': '#/definitions/ProxyConfig'},
+                                                          'error': {'$ref': '#/definitions/Error'},
+                                                          'proxy-settings': {'$ref': '#/definitions/ProxyConfig'}},
+                                           'required': ['proxy-settings',
+                                                        'apt-proxy-settings'],
                                            'type': 'object'},
                      'ProxyConfigResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/ProxyConfigResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/ProxyConfigResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
-                                            'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                            'required': ['results'],
+                                            'type': 'object'}},
      'properties': {'ProxyConfig': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                    'Result': {'$ref': '#/definitions/ProxyConfigResults'}},
                                     'type': 'object'},
@@ -15241,13 +16621,13 @@ class ProxyUpdaterFacade(Type):
     @ReturnMapping(ProxyConfigResults)
     async def ProxyConfig(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ProxyConfigResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ProxyConfigResult]<~ProxyConfigResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='ProxyUpdater', Request='ProxyConfig', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='ProxyUpdater', request='ProxyConfig', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -15256,13 +16636,13 @@ class ProxyUpdaterFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def WatchForProxyConfigAndAPIHostPortChanges(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='ProxyUpdater', Request='WatchForProxyConfigAndAPIHostPortChanges', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='ProxyUpdater', request='WatchForProxyConfigAndAPIHostPortChanges', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -15271,52 +16651,37 @@ class RebootFacade(Type):
     name = 'Reboot'
     version = 2
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
                      'RebootActionResult': {'additionalProperties': False,
                                             'properties': {'error': {'$ref': '#/definitions/Error'},
@@ -15325,21 +16690,7 @@ class RebootFacade(Type):
                      'RebootActionResults': {'additionalProperties': False,
                                              'properties': {'results': {'items': {'$ref': '#/definitions/RebootActionResult'},
                                                                         'type': 'array'}},
-                                             'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                             'type': 'object'}},
      'properties': {'ClearReboot': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                    'Result': {'$ref': '#/definitions/ErrorResults'}},
                                     'type': 'object'},
@@ -15357,13 +16708,13 @@ class RebootFacade(Type):
     @ReturnMapping(ErrorResults)
     async def ClearReboot(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Reboot', Request='ClearReboot', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Reboot', request='ClearReboot', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -15372,13 +16723,13 @@ class RebootFacade(Type):
     @ReturnMapping(RebootActionResults)
     async def GetRebootAction(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~RebootActionResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~RebootActionResult]<~RebootActionResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Reboot', Request='GetRebootAction', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Reboot', request='GetRebootAction', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -15387,13 +16738,13 @@ class RebootFacade(Type):
     @ReturnMapping(ErrorResults)
     async def RequestReboot(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Reboot', Request='RequestReboot', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Reboot', request='RequestReboot', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -15403,11 +16754,11 @@ class RebootFacade(Type):
     async def WatchForRebootEvent(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), str]
+        Returns -> typing.Union[str, _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Reboot', Request='WatchForRebootEvent', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='Reboot', request='WatchForRebootEvent', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -15417,63 +16768,34 @@ class RelationUnitsWatcherFacade(Type):
     name = 'RelationUnitsWatcher'
     version = 1
     schema =     {'definitions': {'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'RelationUnitsChange': {'additionalProperties': False,
-                                             'properties': {'Changed': {'patternProperties': {'.*': {'$ref': '#/definitions/UnitSettings'}},
+                                             'properties': {'changed': {'patternProperties': {'.*': {'$ref': '#/definitions/UnitSettings'}},
                                                                         'type': 'object'},
-                                                            'Departed': {'items': {'type': 'string'},
+                                                            'departed': {'items': {'type': 'string'},
                                                                          'type': 'array'}},
-                                             'required': ['Changed', 'Departed'],
+                                             'required': ['changed'],
                                              'type': 'object'},
                      'RelationUnitsWatchResult': {'additionalProperties': False,
-                                                  'properties': {'Changes': {'$ref': '#/definitions/RelationUnitsChange'},
-                                                                 'Error': {'$ref': '#/definitions/Error'},
-                                                                 'RelationUnitsWatcherId': {'type': 'string'}},
-                                                  'required': ['RelationUnitsWatcherId',
-                                                               'Changes',
-                                                               'Error'],
+                                                  'properties': {'changes': {'$ref': '#/definitions/RelationUnitsChange'},
+                                                                 'error': {'$ref': '#/definitions/Error'},
+                                                                 'watcher-id': {'type': 'string'}},
+                                                  'required': ['watcher-id',
+                                                               'changes'],
                                                   'type': 'object'},
                      'UnitSettings': {'additionalProperties': False,
-                                      'properties': {'Version': {'type': 'integer'}},
-                                      'required': ['Version'],
-                                      'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                      'properties': {'version': {'type': 'integer'}},
+                                      'required': ['version'],
+                                      'type': 'object'}},
      'properties': {'Next': {'properties': {'Result': {'$ref': '#/definitions/RelationUnitsWatchResult'}},
                              'type': 'object'},
                     'Stop': {'type': 'object'}},
@@ -15487,8 +16809,8 @@ class RelationUnitsWatcherFacade(Type):
         Returns -> typing.Union[_ForwardRef('RelationUnitsChange'), _ForwardRef('Error'), str]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='RelationUnitsWatcher', Request='Next', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='RelationUnitsWatcher', request='Next', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -15502,8 +16824,8 @@ class RelationUnitsWatcherFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='RelationUnitsWatcher', Request='Stop', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='RelationUnitsWatcher', request='Stop', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -15522,8 +16844,8 @@ class ResumerFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Resumer', Request='ResumeTransactions', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='Resumer', request='ResumeTransactions', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -15533,85 +16855,56 @@ class RetryStrategyFacade(Type):
     name = 'RetryStrategy'
     version = 1
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
                      'NotifyWatchResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
+                                            'required': ['results'],
                                             'type': 'object'},
                      'RetryStrategy': {'additionalProperties': False,
-                                       'properties': {'JitterRetryTime': {'type': 'boolean'},
-                                                      'MaxRetryTime': {'type': 'integer'},
-                                                      'MinRetryTime': {'type': 'integer'},
-                                                      'RetryTimeFactor': {'type': 'integer'},
-                                                      'ShouldRetry': {'type': 'boolean'}},
-                                       'required': ['ShouldRetry',
-                                                    'MinRetryTime',
-                                                    'MaxRetryTime',
-                                                    'JitterRetryTime',
-                                                    'RetryTimeFactor'],
+                                       'properties': {'jitter-retry-time': {'type': 'boolean'},
+                                                      'max-retry-time': {'type': 'integer'},
+                                                      'min-retry-time': {'type': 'integer'},
+                                                      'retry-time-factor': {'type': 'integer'},
+                                                      'should-retry': {'type': 'boolean'}},
+                                       'required': ['should-retry',
+                                                    'min-retry-time',
+                                                    'max-retry-time',
+                                                    'jitter-retry-time',
+                                                    'retry-time-factor'],
                                        'type': 'object'},
                      'RetryStrategyResult': {'additionalProperties': False,
-                                             'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                            'Result': {'$ref': '#/definitions/RetryStrategy'}},
-                                             'required': ['Error', 'Result'],
+                                             'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                            'result': {'$ref': '#/definitions/RetryStrategy'}},
                                              'type': 'object'},
                      'RetryStrategyResults': {'additionalProperties': False,
-                                              'properties': {'Results': {'items': {'$ref': '#/definitions/RetryStrategyResult'},
+                                              'properties': {'results': {'items': {'$ref': '#/definitions/RetryStrategyResult'},
                                                                          'type': 'array'}},
-                                              'required': ['Results'],
-                                              'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                              'required': ['results'],
+                                              'type': 'object'}},
      'properties': {'RetryStrategy': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                      'Result': {'$ref': '#/definitions/RetryStrategyResults'}},
                                       'type': 'object'},
@@ -15624,13 +16917,13 @@ class RetryStrategyFacade(Type):
     @ReturnMapping(RetryStrategyResults)
     async def RetryStrategy(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~RetryStrategyResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~RetryStrategyResult]<~RetryStrategyResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='RetryStrategy', Request='RetryStrategy', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='RetryStrategy', request='RetryStrategy', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -15639,54 +16932,40 @@ class RetryStrategyFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def WatchRetryStrategy(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='RetryStrategy', Request='WatchRetryStrategy', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='RetryStrategy', request='WatchRetryStrategy', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 class SSHClientFacade(Type):
     name = 'SSHClient'
-    version = 1
+    version = 2
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'SSHAddressResult': {'additionalProperties': False,
                                           'properties': {'address': {'type': 'string'},
                                                          'error': {'$ref': '#/definitions/Error'}},
@@ -15696,6 +16975,17 @@ class SSHClientFacade(Type):
                                                                       'type': 'array'}},
                                            'required': ['results'],
                                            'type': 'object'},
+                     'SSHAddressesResult': {'additionalProperties': False,
+                                            'properties': {'addresses': {'items': {'type': 'string'},
+                                                                         'type': 'array'},
+                                                           'error': {'$ref': '#/definitions/Error'}},
+                                            'required': ['addresses'],
+                                            'type': 'object'},
+                     'SSHAddressesResults': {'additionalProperties': False,
+                                             'properties': {'results': {'items': {'$ref': '#/definitions/SSHAddressesResult'},
+                                                                        'type': 'array'}},
+                                             'required': ['results'],
+                                             'type': 'object'},
                      'SSHProxyResult': {'additionalProperties': False,
                                         'properties': {'use-proxy': {'type': 'boolean'}},
                                         'required': ['use-proxy'],
@@ -15709,22 +16999,11 @@ class SSHClientFacade(Type):
                                               'properties': {'results': {'items': {'$ref': '#/definitions/SSHPublicKeysResult'},
                                                                          'type': 'array'}},
                                               'required': ['results'],
-                                              'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
-     'properties': {'PrivateAddress': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                              'type': 'object'}},
+     'properties': {'AllAddresses': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                    'Result': {'$ref': '#/definitions/SSHAddressesResults'}},
+                                     'type': 'object'},
+                    'PrivateAddress': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                       'Result': {'$ref': '#/definitions/SSHAddressResults'}},
                                        'type': 'object'},
                     'Proxy': {'properties': {'Result': {'$ref': '#/definitions/SSHProxyResult'}},
@@ -15738,16 +17017,31 @@ class SSHClientFacade(Type):
      'type': 'object'}
     
 
+    @ReturnMapping(SSHAddressesResults)
+    async def AllAddresses(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~SSHAddressesResult]<~SSHAddressesResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='SSHClient', request='AllAddresses', version=2, params=_params)
+        _params['entities'] = entities
+        reply = await self.rpc(msg)
+        return reply
+
+
+
     @ReturnMapping(SSHAddressResults)
     async def PrivateAddress(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~SSHAddressResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~SSHAddressResult]<~SSHAddressResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='SSHClient', Request='PrivateAddress', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='SSHClient', request='PrivateAddress', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -15760,8 +17054,8 @@ class SSHClientFacade(Type):
         Returns -> bool
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='SSHClient', Request='Proxy', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='SSHClient', request='Proxy', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -15771,13 +17065,13 @@ class SSHClientFacade(Type):
     @ReturnMapping(SSHAddressResults)
     async def PublicAddress(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~SSHAddressResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~SSHAddressResult]<~SSHAddressResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='SSHClient', Request='PublicAddress', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='SSHClient', request='PublicAddress', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -15786,13 +17080,13 @@ class SSHClientFacade(Type):
     @ReturnMapping(SSHPublicKeysResults)
     async def PublicKeys(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~SSHPublicKeysResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~SSHPublicKeysResult]<~SSHPublicKeysResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='SSHClient', Request='PublicKeys', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='SSHClient', request='PublicKeys', version=2, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -15801,75 +17095,46 @@ class SingularFacade(Type):
     name = 'Singular'
     version = 1
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'SingularClaim': {'additionalProperties': False,
-                                       'properties': {'ControllerTag': {'type': 'string'},
-                                                      'Duration': {'type': 'integer'},
-                                                      'ModelTag': {'type': 'string'}},
-                                       'required': ['ModelTag',
-                                                    'ControllerTag',
-                                                    'Duration'],
+                                       'properties': {'controller-tag': {'type': 'string'},
+                                                      'duration': {'type': 'integer'},
+                                                      'model-tag': {'type': 'string'}},
+                                       'required': ['model-tag',
+                                                    'controller-tag',
+                                                    'duration'],
                                        'type': 'object'},
-                     'SingularClaims': {'additionalProperties': False,
-                                        'properties': {'Claims': {'items': {'$ref': '#/definitions/SingularClaim'},
-                                                                  'type': 'array'}},
-                                        'required': ['Claims'],
-                                        'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                     'SingularClaims': {'additionalProperties': False,
+                                        'properties': {'claims': {'items': {'$ref': '#/definitions/SingularClaim'},
+                                                                  'type': 'array'}},
+                                        'required': ['claims'],
+                                        'type': 'object'}},
      'properties': {'Claim': {'properties': {'Params': {'$ref': '#/definitions/SingularClaims'},
                                              'Result': {'$ref': '#/definitions/ErrorResults'}},
                               'type': 'object'},
@@ -15882,13 +17147,13 @@ class SingularFacade(Type):
     @ReturnMapping(ErrorResults)
     async def Claim(self, claims):
         '''
-        claims : typing.Sequence[~SingularClaim]
-        Returns -> typing.Sequence[~ErrorResult]
+        claims : typing.Sequence<+T_co>[~SingularClaim]<~SingularClaim>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Singular', Request='Claim', Version=1, Params=params)
-        params['Claims'] = claims
+        _params = dict()
+        msg = dict(type='Singular', request='Claim', version=1, params=_params)
+        _params['claims'] = claims
         reply = await self.rpc(msg)
         return reply
 
@@ -15897,13 +17162,13 @@ class SingularFacade(Type):
     @ReturnMapping(ErrorResults)
     async def Wait(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Singular', Request='Wait', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Singular', request='Wait', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -15912,98 +17177,65 @@ class SpacesFacade(Type):
     name = 'Spaces'
     version = 2
     schema =     {'definitions': {'CreateSpaceParams': {'additionalProperties': False,
-                                           'properties': {'ProviderId': {'type': 'string'},
-                                                          'Public': {'type': 'boolean'},
-                                                          'SpaceTag': {'type': 'string'},
-                                                          'SubnetTags': {'items': {'type': 'string'},
-                                                                         'type': 'array'}},
-                                           'required': ['SubnetTags',
-                                                        'SpaceTag',
-                                                        'Public'],
+                                           'properties': {'provider-id': {'type': 'string'},
+                                                          'public': {'type': 'boolean'},
+                                                          'space-tag': {'type': 'string'},
+                                                          'subnet-tags': {'items': {'type': 'string'},
+                                                                          'type': 'array'}},
+                                           'required': ['subnet-tags',
+                                                        'space-tag',
+                                                        'public'],
                                            'type': 'object'},
                      'CreateSpacesParams': {'additionalProperties': False,
-                                            'properties': {'Spaces': {'items': {'$ref': '#/definitions/CreateSpaceParams'},
+                                            'properties': {'spaces': {'items': {'$ref': '#/definitions/CreateSpaceParams'},
                                                                       'type': 'array'}},
-                                            'required': ['Spaces'],
+                                            'required': ['spaces'],
                                             'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'ListSpacesResults': {'additionalProperties': False,
-                                           'properties': {'Results': {'items': {'$ref': '#/definitions/Space'},
+                                           'properties': {'results': {'items': {'$ref': '#/definitions/Space'},
                                                                       'type': 'array'}},
-                                           'required': ['Results'],
+                                           'required': ['results'],
                                            'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'Space': {'additionalProperties': False,
-                               'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                              'Name': {'type': 'string'},
-                                              'Subnets': {'items': {'$ref': '#/definitions/Subnet'},
+                               'properties': {'error': {'$ref': '#/definitions/Error'},
+                                              'name': {'type': 'string'},
+                                              'subnets': {'items': {'$ref': '#/definitions/Subnet'},
                                                           'type': 'array'}},
-                               'required': ['Name', 'Subnets'],
+                               'required': ['name', 'subnets'],
                                'type': 'object'},
                      'Subnet': {'additionalProperties': False,
-                                'properties': {'CIDR': {'type': 'string'},
-                                               'Life': {'type': 'string'},
-                                               'ProviderId': {'type': 'string'},
-                                               'SpaceTag': {'type': 'string'},
-                                               'StaticRangeHighIP': {'items': {'type': 'integer'},
-                                                                     'type': 'array'},
-                                               'StaticRangeLowIP': {'items': {'type': 'integer'},
-                                                                    'type': 'array'},
-                                               'Status': {'type': 'string'},
-                                               'VLANTag': {'type': 'integer'},
-                                               'Zones': {'items': {'type': 'string'},
+                                'properties': {'cidr': {'type': 'string'},
+                                               'life': {'type': 'string'},
+                                               'provider-id': {'type': 'string'},
+                                               'space-tag': {'type': 'string'},
+                                               'status': {'type': 'string'},
+                                               'vlan-tag': {'type': 'integer'},
+                                               'zones': {'items': {'type': 'string'},
                                                          'type': 'array'}},
-                                'required': ['CIDR',
-                                             'VLANTag',
-                                             'Life',
-                                             'SpaceTag',
-                                             'Zones'],
-                                'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
+                                'required': ['cidr',
+                                             'vlan-tag',
+                                             'life',
+                                             'space-tag',
+                                             'zones'],
                                 'type': 'object'}},
      'properties': {'CreateSpaces': {'properties': {'Params': {'$ref': '#/definitions/CreateSpacesParams'},
                                                     'Result': {'$ref': '#/definitions/ErrorResults'}},
@@ -16016,13 +17248,13 @@ class SpacesFacade(Type):
     @ReturnMapping(ErrorResults)
     async def CreateSpaces(self, spaces):
         '''
-        spaces : typing.Sequence[~CreateSpaceParams]
-        Returns -> typing.Sequence[~ErrorResult]
+        spaces : typing.Sequence<+T_co>[~CreateSpaceParams]<~CreateSpaceParams>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Spaces', Request='CreateSpaces', Version=2, Params=params)
-        params['Spaces'] = spaces
+        _params = dict()
+        msg = dict(type='Spaces', request='CreateSpaces', version=2, params=_params)
+        _params['spaces'] = spaces
         reply = await self.rpc(msg)
         return reply
 
@@ -16032,11 +17264,11 @@ class SpacesFacade(Type):
     async def ListSpaces(self):
         '''
 
-        Returns -> typing.Sequence[~Space]
+        Returns -> typing.Sequence<+T_co>[~Space]<~Space>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Spaces', Request='ListSpaces', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='Spaces', request='ListSpaces', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -16046,10 +17278,10 @@ class StatusHistoryFacade(Type):
     name = 'StatusHistory'
     version = 2
     schema =     {'definitions': {'StatusHistoryPruneArgs': {'additionalProperties': False,
-                                                'properties': {'MaxHistoryMB': {'type': 'integer'},
-                                                               'MaxHistoryTime': {'type': 'integer'}},
-                                                'required': ['MaxHistoryTime',
-                                                             'MaxHistoryMB'],
+                                                'properties': {'max-history-mb': {'type': 'integer'},
+                                                               'max-history-time': {'type': 'integer'}},
+                                                'required': ['max-history-time',
+                                                             'max-history-mb'],
                                                 'type': 'object'}},
      'properties': {'Prune': {'properties': {'Params': {'$ref': '#/definitions/StatusHistoryPruneArgs'}},
                               'type': 'object'}},
@@ -16057,78 +17289,74 @@ class StatusHistoryFacade(Type):
     
 
     @ReturnMapping(None)
-    async def Prune(self, maxhistorymb, maxhistorytime):
+    async def Prune(self, max_history_mb, max_history_time):
         '''
-        maxhistorymb : int
-        maxhistorytime : int
+        max_history_mb : int
+        max_history_time : int
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StatusHistory', Request='Prune', Version=2, Params=params)
-        params['MaxHistoryMB'] = maxhistorymb
-        params['MaxHistoryTime'] = maxhistorytime
+        _params = dict()
+        msg = dict(type='StatusHistory', request='Prune', version=2, params=_params)
+        _params['max-history-mb'] = max_history_mb
+        _params['max-history-time'] = max_history_time
         reply = await self.rpc(msg)
         return reply
 
 
 class StorageFacade(Type):
     name = 'Storage'
-    version = 2
+    version = 3
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'EntityStatus': {'additionalProperties': False,
-                                      'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True,
+                                      'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                            'type': 'object'}},
                                                               'type': 'object'},
-                                                     'Info': {'type': 'string'},
-                                                     'Since': {'format': 'date-time',
+                                                     'info': {'type': 'string'},
+                                                     'since': {'format': 'date-time',
                                                                'type': 'string'},
-                                                     'Status': {'type': 'string'}},
-                                      'required': ['Status',
-                                                   'Info',
-                                                   'Data',
-                                                   'Since'],
+                                                     'status': {'type': 'string'}},
+                                      'required': ['status', 'info', 'since'],
                                       'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'FilesystemAttachmentInfo': {'additionalProperties': False,
-                                                  'properties': {'mountpoint': {'type': 'string'},
+                                                  'properties': {'mount-point': {'type': 'string'},
                                                                  'read-only': {'type': 'boolean'}},
                                                   'type': 'object'},
                      'FilesystemDetails': {'additionalProperties': False,
-                                           'properties': {'filesystemtag': {'type': 'string'},
+                                           'properties': {'filesystem-tag': {'type': 'string'},
                                                           'info': {'$ref': '#/definitions/FilesystemInfo'},
-                                                          'machineattachments': {'patternProperties': {'.*': {'$ref': '#/definitions/FilesystemAttachmentInfo'}},
-                                                                                 'type': 'object'},
+                                                          'machine-attachments': {'patternProperties': {'.*': {'$ref': '#/definitions/FilesystemAttachmentInfo'}},
+                                                                                  'type': 'object'},
                                                           'status': {'$ref': '#/definitions/EntityStatus'},
                                                           'storage': {'$ref': '#/definitions/StorageDetails'},
-                                                          'volumetag': {'type': 'string'}},
-                                           'required': ['filesystemtag',
+                                                          'volume-tag': {'type': 'string'}},
+                                           'required': ['filesystem-tag',
                                                         'info',
                                                         'status'],
                                            'type': 'object'},
@@ -16150,61 +17378,44 @@ class StorageFacade(Type):
                                                                       'type': 'array'}},
                                            'type': 'object'},
                      'FilesystemInfo': {'additionalProperties': False,
-                                        'properties': {'filesystemid': {'type': 'string'},
+                                        'properties': {'filesystem-id': {'type': 'string'},
                                                        'size': {'type': 'integer'}},
-                                        'required': ['filesystemid', 'size'],
+                                        'required': ['filesystem-id', 'size'],
                                         'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'StorageAddParams': {'additionalProperties': False,
-                                          'properties': {'StorageName': {'type': 'string'},
+                                          'properties': {'name': {'type': 'string'},
                                                          'storage': {'$ref': '#/definitions/StorageConstraints'},
                                                          'unit': {'type': 'string'}},
-                                          'required': ['unit',
-                                                       'StorageName',
-                                                       'storage'],
+                                          'required': ['unit', 'name', 'storage'],
                                           'type': 'object'},
                      'StorageAttachmentDetails': {'additionalProperties': False,
                                                   'properties': {'location': {'type': 'string'},
-                                                                 'machinetag': {'type': 'string'},
-                                                                 'storagetag': {'type': 'string'},
-                                                                 'unittag': {'type': 'string'}},
-                                                  'required': ['storagetag',
-                                                               'unittag',
-                                                               'machinetag'],
+                                                                 'machine-tag': {'type': 'string'},
+                                                                 'storage-tag': {'type': 'string'},
+                                                                 'unit-tag': {'type': 'string'}},
+                                                  'required': ['storage-tag',
+                                                               'unit-tag',
+                                                               'machine-tag'],
                                                   'type': 'object'},
                      'StorageConstraints': {'additionalProperties': False,
-                                            'properties': {'Count': {'type': 'integer'},
-                                                           'Pool': {'type': 'string'},
-                                                           'Size': {'type': 'integer'}},
-                                            'required': ['Pool', 'Size', 'Count'],
+                                            'properties': {'count': {'type': 'integer'},
+                                                           'pool': {'type': 'string'},
+                                                           'size': {'type': 'integer'}},
                                             'type': 'object'},
                      'StorageDetails': {'additionalProperties': False,
-                                        'properties': {'Persistent': {'type': 'boolean'},
-                                                       'attachments': {'patternProperties': {'.*': {'$ref': '#/definitions/StorageAttachmentDetails'}},
+                                        'properties': {'attachments': {'patternProperties': {'.*': {'$ref': '#/definitions/StorageAttachmentDetails'}},
                                                                        'type': 'object'},
                                                        'kind': {'type': 'integer'},
-                                                       'ownertag': {'type': 'string'},
+                                                       'owner-tag': {'type': 'string'},
+                                                       'persistent': {'type': 'boolean'},
                                                        'status': {'$ref': '#/definitions/EntityStatus'},
-                                                       'storagetag': {'type': 'string'}},
-                                        'required': ['storagetag',
-                                                     'ownertag',
+                                                       'storage-tag': {'type': 'string'}},
+                                        'required': ['storage-tag',
+                                                     'owner-tag',
                                                      'kind',
                                                      'status',
-                                                     'Persistent'],
+                                                     'persistent'],
                                         'type': 'object'},
                      'StorageDetailsListResult': {'additionalProperties': False,
                                                   'properties': {'error': {'$ref': '#/definitions/Error'},
@@ -16249,8 +17460,8 @@ class StorageFacade(Type):
                                             'type': 'object'},
                      'StoragePoolsResult': {'additionalProperties': False,
                                             'properties': {'error': {'$ref': '#/definitions/Error'},
-                                                           'storagepools': {'items': {'$ref': '#/definitions/StoragePool'},
-                                                                            'type': 'array'}},
+                                                           'storage-pools': {'items': {'$ref': '#/definitions/StoragePool'},
+                                                                             'type': 'array'}},
                                             'type': 'object'},
                      'StoragePoolsResults': {'additionalProperties': False,
                                              'properties': {'results': {'items': {'$ref': '#/definitions/StoragePoolsResult'},
@@ -16262,19 +17473,19 @@ class StorageFacade(Type):
                                            'required': ['storages'],
                                            'type': 'object'},
                      'VolumeAttachmentInfo': {'additionalProperties': False,
-                                              'properties': {'busaddress': {'type': 'string'},
-                                                             'devicelink': {'type': 'string'},
-                                                             'devicename': {'type': 'string'},
+                                              'properties': {'bus-address': {'type': 'string'},
+                                                             'device-link': {'type': 'string'},
+                                                             'device-name': {'type': 'string'},
                                                              'read-only': {'type': 'boolean'}},
                                               'type': 'object'},
                      'VolumeDetails': {'additionalProperties': False,
                                        'properties': {'info': {'$ref': '#/definitions/VolumeInfo'},
-                                                      'machineattachments': {'patternProperties': {'.*': {'$ref': '#/definitions/VolumeAttachmentInfo'}},
-                                                                             'type': 'object'},
+                                                      'machine-attachments': {'patternProperties': {'.*': {'$ref': '#/definitions/VolumeAttachmentInfo'}},
+                                                                              'type': 'object'},
                                                       'status': {'$ref': '#/definitions/EntityStatus'},
                                                       'storage': {'$ref': '#/definitions/StorageDetails'},
-                                                      'volumetag': {'type': 'string'}},
-                                       'required': ['volumetag', 'info', 'status'],
+                                                      'volume-tag': {'type': 'string'}},
+                                       'required': ['volume-tag', 'info', 'status'],
                                        'type': 'object'},
                      'VolumeDetailsListResult': {'additionalProperties': False,
                                                  'properties': {'error': {'$ref': '#/definitions/Error'},
@@ -16294,26 +17505,12 @@ class StorageFacade(Type):
                                                                   'type': 'array'}},
                                        'type': 'object'},
                      'VolumeInfo': {'additionalProperties': False,
-                                    'properties': {'hardwareid': {'type': 'string'},
+                                    'properties': {'hardware-id': {'type': 'string'},
                                                    'persistent': {'type': 'boolean'},
                                                    'size': {'type': 'integer'},
-                                                   'volumeid': {'type': 'string'}},
-                                    'required': ['volumeid', 'size', 'persistent'],
-                                    'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                                   'volume-id': {'type': 'string'}},
+                                    'required': ['volume-id', 'size', 'persistent'],
+                                    'type': 'object'}},
      'properties': {'AddToUnit': {'properties': {'Params': {'$ref': '#/definitions/StoragesAddParams'},
                                                  'Result': {'$ref': '#/definitions/ErrorResults'}},
                                   'type': 'object'},
@@ -16340,13 +17537,13 @@ class StorageFacade(Type):
     @ReturnMapping(ErrorResults)
     async def AddToUnit(self, storages):
         '''
-        storages : typing.Sequence[~StorageAddParams]
-        Returns -> typing.Sequence[~ErrorResult]
+        storages : typing.Sequence<+T_co>[~StorageAddParams]<~StorageAddParams>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Storage', Request='AddToUnit', Version=2, Params=params)
-        params['storages'] = storages
+        _params = dict()
+        msg = dict(type='Storage', request='AddToUnit', version=3, params=_params)
+        _params['storages'] = storages
         reply = await self.rpc(msg)
         return reply
 
@@ -16355,17 +17552,17 @@ class StorageFacade(Type):
     @ReturnMapping(None)
     async def CreatePool(self, attrs, name, provider):
         '''
-        attrs : typing.Mapping[str, typing.Any]
+        attrs : typing.Mapping<~KT, +VT_co>[str, typing.Any]
         name : str
         provider : str
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Storage', Request='CreatePool', Version=2, Params=params)
-        params['attrs'] = attrs
-        params['name'] = name
-        params['provider'] = provider
+        _params = dict()
+        msg = dict(type='Storage', request='CreatePool', version=3, params=_params)
+        _params['attrs'] = attrs
+        _params['name'] = name
+        _params['provider'] = provider
         reply = await self.rpc(msg)
         return reply
 
@@ -16374,13 +17571,13 @@ class StorageFacade(Type):
     @ReturnMapping(FilesystemDetailsListResults)
     async def ListFilesystems(self, filters):
         '''
-        filters : typing.Sequence[~FilesystemFilter]
-        Returns -> typing.Sequence[~FilesystemDetailsListResult]
+        filters : typing.Sequence<+T_co>[~FilesystemFilter]<~FilesystemFilter>
+        Returns -> typing.Sequence<+T_co>[~FilesystemDetailsListResult]<~FilesystemDetailsListResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Storage', Request='ListFilesystems', Version=2, Params=params)
-        params['filters'] = filters
+        _params = dict()
+        msg = dict(type='Storage', request='ListFilesystems', version=3, params=_params)
+        _params['filters'] = filters
         reply = await self.rpc(msg)
         return reply
 
@@ -16389,13 +17586,13 @@ class StorageFacade(Type):
     @ReturnMapping(StoragePoolsResults)
     async def ListPools(self, filters):
         '''
-        filters : typing.Sequence[~StoragePoolFilter]
-        Returns -> typing.Sequence[~StoragePoolsResult]
+        filters : typing.Sequence<+T_co>[~StoragePoolFilter]<~StoragePoolFilter>
+        Returns -> typing.Sequence<+T_co>[~StoragePoolsResult]<~StoragePoolsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Storage', Request='ListPools', Version=2, Params=params)
-        params['filters'] = filters
+        _params = dict()
+        msg = dict(type='Storage', request='ListPools', version=3, params=_params)
+        _params['filters'] = filters
         reply = await self.rpc(msg)
         return reply
 
@@ -16404,13 +17601,13 @@ class StorageFacade(Type):
     @ReturnMapping(StorageDetailsListResults)
     async def ListStorageDetails(self, filters):
         '''
-        filters : typing.Sequence[~StorageFilter]
-        Returns -> typing.Sequence[~StorageDetailsListResult]
+        filters : typing.Sequence<+T_co>[~StorageFilter]<~StorageFilter>
+        Returns -> typing.Sequence<+T_co>[~StorageDetailsListResult]<~StorageDetailsListResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Storage', Request='ListStorageDetails', Version=2, Params=params)
-        params['filters'] = filters
+        _params = dict()
+        msg = dict(type='Storage', request='ListStorageDetails', version=3, params=_params)
+        _params['filters'] = filters
         reply = await self.rpc(msg)
         return reply
 
@@ -16419,13 +17616,13 @@ class StorageFacade(Type):
     @ReturnMapping(VolumeDetailsListResults)
     async def ListVolumes(self, filters):
         '''
-        filters : typing.Sequence[~VolumeFilter]
-        Returns -> typing.Sequence[~VolumeDetailsListResult]
+        filters : typing.Sequence<+T_co>[~VolumeFilter]<~VolumeFilter>
+        Returns -> typing.Sequence<+T_co>[~VolumeDetailsListResult]<~VolumeDetailsListResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Storage', Request='ListVolumes', Version=2, Params=params)
-        params['filters'] = filters
+        _params = dict()
+        msg = dict(type='Storage', request='ListVolumes', version=3, params=_params)
+        _params['filters'] = filters
         reply = await self.rpc(msg)
         return reply
 
@@ -16434,20 +17631,20 @@ class StorageFacade(Type):
     @ReturnMapping(StorageDetailsResults)
     async def StorageDetails(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StorageDetailsResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StorageDetailsResult]<~StorageDetailsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Storage', Request='StorageDetails', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Storage', request='StorageDetails', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 class StorageProvisionerFacade(Type):
     name = 'StorageProvisioner'
-    version = 2
+    version = 3
     schema =     {'definitions': {'BlockDevice': {'additionalProperties': False,
                                      'properties': {'BusAddress': {'type': 'string'},
                                                     'DeviceLinks': {'items': {'type': 'string'},
@@ -16481,73 +17678,72 @@ class StorageProvisionerFacade(Type):
                                                                        'type': 'array'}},
                                             'type': 'object'},
                      'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'EntityStatusArgs': {'additionalProperties': False,
-                                          'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True,
+                                          'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                'type': 'object'}},
                                                                   'type': 'object'},
-                                                         'Info': {'type': 'string'},
-                                                         'Status': {'type': 'string'},
-                                                         'Tag': {'type': 'string'}},
-                                          'required': ['Tag',
-                                                       'Status',
-                                                       'Info',
-                                                       'Data'],
+                                                         'info': {'type': 'string'},
+                                                         'status': {'type': 'string'},
+                                                         'tag': {'type': 'string'}},
+                                          'required': ['tag',
+                                                       'status',
+                                                       'info',
+                                                       'data'],
                                           'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'Filesystem': {'additionalProperties': False,
-                                    'properties': {'filesystemtag': {'type': 'string'},
+                                    'properties': {'filesystem-tag': {'type': 'string'},
                                                    'info': {'$ref': '#/definitions/FilesystemInfo'},
-                                                   'volumetag': {'type': 'string'}},
-                                    'required': ['filesystemtag', 'info'],
+                                                   'volume-tag': {'type': 'string'}},
+                                    'required': ['filesystem-tag', 'info'],
                                     'type': 'object'},
                      'FilesystemAttachment': {'additionalProperties': False,
-                                              'properties': {'filesystemtag': {'type': 'string'},
+                                              'properties': {'filesystem-tag': {'type': 'string'},
                                                              'info': {'$ref': '#/definitions/FilesystemAttachmentInfo'},
-                                                             'machinetag': {'type': 'string'}},
-                                              'required': ['filesystemtag',
-                                                           'machinetag',
+                                                             'machine-tag': {'type': 'string'}},
+                                              'required': ['filesystem-tag',
+                                                           'machine-tag',
                                                            'info'],
                                               'type': 'object'},
                      'FilesystemAttachmentInfo': {'additionalProperties': False,
-                                                  'properties': {'mountpoint': {'type': 'string'},
+                                                  'properties': {'mount-point': {'type': 'string'},
                                                                  'read-only': {'type': 'boolean'}},
                                                   'type': 'object'},
                      'FilesystemAttachmentParams': {'additionalProperties': False,
-                                                    'properties': {'filesystemid': {'type': 'string'},
-                                                                   'filesystemtag': {'type': 'string'},
-                                                                   'instanceid': {'type': 'string'},
-                                                                   'machinetag': {'type': 'string'},
-                                                                   'mountpoint': {'type': 'string'},
+                                                    'properties': {'filesystem-id': {'type': 'string'},
+                                                                   'filesystem-tag': {'type': 'string'},
+                                                                   'instance-id': {'type': 'string'},
+                                                                   'machine-tag': {'type': 'string'},
+                                                                   'mount-point': {'type': 'string'},
                                                                    'provider': {'type': 'string'},
                                                                    'read-only': {'type': 'boolean'}},
-                                                    'required': ['filesystemtag',
-                                                                 'machinetag',
+                                                    'required': ['filesystem-tag',
+                                                                 'machine-tag',
                                                                  'provider'],
                                                     'type': 'object'},
                      'FilesystemAttachmentParamsResult': {'additionalProperties': False,
@@ -16569,27 +17765,27 @@ class StorageProvisionerFacade(Type):
                                                                                 'type': 'array'}},
                                                      'type': 'object'},
                      'FilesystemAttachments': {'additionalProperties': False,
-                                               'properties': {'filesystemattachments': {'items': {'$ref': '#/definitions/FilesystemAttachment'},
-                                                                                        'type': 'array'}},
-                                               'required': ['filesystemattachments'],
+                                               'properties': {'filesystem-attachments': {'items': {'$ref': '#/definitions/FilesystemAttachment'},
+                                                                                         'type': 'array'}},
+                                               'required': ['filesystem-attachments'],
                                                'type': 'object'},
                      'FilesystemInfo': {'additionalProperties': False,
-                                        'properties': {'filesystemid': {'type': 'string'},
+                                        'properties': {'filesystem-id': {'type': 'string'},
                                                        'size': {'type': 'integer'}},
-                                        'required': ['filesystemid', 'size'],
+                                        'required': ['filesystem-id', 'size'],
                                         'type': 'object'},
                      'FilesystemParams': {'additionalProperties': False,
                                           'properties': {'attachment': {'$ref': '#/definitions/FilesystemAttachmentParams'},
                                                          'attributes': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                      'type': 'object'}},
                                                                         'type': 'object'},
-                                                         'filesystemtag': {'type': 'string'},
+                                                         'filesystem-tag': {'type': 'string'},
                                                          'provider': {'type': 'string'},
                                                          'size': {'type': 'integer'},
                                                          'tags': {'patternProperties': {'.*': {'type': 'string'}},
                                                                   'type': 'object'},
-                                                         'volumetag': {'type': 'string'}},
-                                          'required': ['filesystemtag',
+                                                         'volume-tag': {'type': 'string'}},
+                                          'required': ['filesystem-tag',
                                                        'size',
                                                        'provider'],
                                           'type': 'object'},
@@ -16617,35 +17813,21 @@ class StorageProvisionerFacade(Type):
                                      'required': ['filesystems'],
                                      'type': 'object'},
                      'LifeResult': {'additionalProperties': False,
-                                    'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                   'Life': {'type': 'string'}},
-                                    'required': ['Life', 'Error'],
+                                    'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                   'life': {'type': 'string'}},
+                                    'required': ['life'],
                                     'type': 'object'},
                      'LifeResults': {'additionalProperties': False,
-                                     'properties': {'Results': {'items': {'$ref': '#/definitions/LifeResult'},
+                                     'properties': {'results': {'items': {'$ref': '#/definitions/LifeResult'},
                                                                 'type': 'array'}},
-                                     'required': ['Results'],
+                                     'required': ['results'],
                                      'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'MachineStorageId': {'additionalProperties': False,
-                                          'properties': {'attachmenttag': {'type': 'string'},
-                                                         'machinetag': {'type': 'string'}},
-                                          'required': ['machinetag',
-                                                       'attachmenttag'],
+                                          'properties': {'attachment-tag': {'type': 'string'},
+                                                         'machine-tag': {'type': 'string'}},
+                                          'required': ['machine-tag',
+                                                       'attachment-tag'],
                                           'type': 'object'},
                      'MachineStorageIds': {'additionalProperties': False,
                                            'properties': {'ids': {'items': {'$ref': '#/definitions/MachineStorageId'},
@@ -16653,92 +17835,83 @@ class StorageProvisionerFacade(Type):
                                            'required': ['ids'],
                                            'type': 'object'},
                      'MachineStorageIdsWatchResult': {'additionalProperties': False,
-                                                      'properties': {'Changes': {'items': {'$ref': '#/definitions/MachineStorageId'},
+                                                      'properties': {'changes': {'items': {'$ref': '#/definitions/MachineStorageId'},
                                                                                  'type': 'array'},
-                                                                     'Error': {'$ref': '#/definitions/Error'},
-                                                                     'MachineStorageIdsWatcherId': {'type': 'string'}},
-                                                      'required': ['MachineStorageIdsWatcherId',
-                                                                   'Changes',
-                                                                   'Error'],
+                                                                     'error': {'$ref': '#/definitions/Error'},
+                                                                     'watcher-id': {'type': 'string'}},
+                                                      'required': ['watcher-id',
+                                                                   'changes'],
                                                       'type': 'object'},
                      'MachineStorageIdsWatchResults': {'additionalProperties': False,
-                                                       'properties': {'Results': {'items': {'$ref': '#/definitions/MachineStorageIdsWatchResult'},
+                                                       'properties': {'results': {'items': {'$ref': '#/definitions/MachineStorageIdsWatchResult'},
                                                                                   'type': 'array'}},
-                                                       'required': ['Results'],
+                                                       'required': ['results'],
                                                        'type': 'object'},
-                     'ModelConfigResult': {'additionalProperties': False,
-                                           'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True,
-                                                                                                  'type': 'object'}},
-                                                                     'type': 'object'}},
-                                           'required': ['Config'],
-                                           'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
                      'NotifyWatchResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
+                                            'required': ['results'],
                                             'type': 'object'},
                      'SetStatus': {'additionalProperties': False,
-                                   'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'},
+                                   'properties': {'entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'},
                                                                'type': 'array'}},
-                                   'required': ['Entities'],
+                                   'required': ['entities'],
                                    'type': 'object'},
                      'StringResult': {'additionalProperties': False,
-                                      'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                     'Result': {'type': 'string'}},
-                                      'required': ['Error', 'Result'],
+                                      'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                     'result': {'type': 'string'}},
+                                      'required': ['result'],
                                       'type': 'object'},
                      'StringResults': {'additionalProperties': False,
-                                       'properties': {'Results': {'items': {'$ref': '#/definitions/StringResult'},
+                                       'properties': {'results': {'items': {'$ref': '#/definitions/StringResult'},
                                                                   'type': 'array'}},
-                                       'required': ['Results'],
+                                       'required': ['results'],
                                        'type': 'object'},
                      'StringsWatchResult': {'additionalProperties': False,
-                                            'properties': {'Changes': {'items': {'type': 'string'},
+                                            'properties': {'changes': {'items': {'type': 'string'},
                                                                        'type': 'array'},
-                                                           'Error': {'$ref': '#/definitions/Error'},
-                                                           'StringsWatcherId': {'type': 'string'}},
-                                            'required': ['StringsWatcherId',
-                                                         'Changes',
-                                                         'Error'],
+                                                           'error': {'$ref': '#/definitions/Error'},
+                                                           'watcher-id': {'type': 'string'}},
+                                            'required': ['watcher-id'],
                                             'type': 'object'},
                      'StringsWatchResults': {'additionalProperties': False,
-                                             'properties': {'Results': {'items': {'$ref': '#/definitions/StringsWatchResult'},
+                                             'properties': {'results': {'items': {'$ref': '#/definitions/StringsWatchResult'},
                                                                         'type': 'array'}},
-                                             'required': ['Results'],
+                                             'required': ['results'],
                                              'type': 'object'},
                      'Volume': {'additionalProperties': False,
                                 'properties': {'info': {'$ref': '#/definitions/VolumeInfo'},
-                                               'volumetag': {'type': 'string'}},
-                                'required': ['volumetag', 'info'],
+                                               'volume-tag': {'type': 'string'}},
+                                'required': ['volume-tag', 'info'],
                                 'type': 'object'},
                      'VolumeAttachment': {'additionalProperties': False,
                                           'properties': {'info': {'$ref': '#/definitions/VolumeAttachmentInfo'},
-                                                         'machinetag': {'type': 'string'},
-                                                         'volumetag': {'type': 'string'}},
-                                          'required': ['volumetag',
-                                                       'machinetag',
+                                                         'machine-tag': {'type': 'string'},
+                                                         'volume-tag': {'type': 'string'}},
+                                          'required': ['volume-tag',
+                                                       'machine-tag',
                                                        'info'],
                                           'type': 'object'},
                      'VolumeAttachmentInfo': {'additionalProperties': False,
-                                              'properties': {'busaddress': {'type': 'string'},
-                                                             'devicelink': {'type': 'string'},
-                                                             'devicename': {'type': 'string'},
+                                              'properties': {'bus-address': {'type': 'string'},
+                                                             'device-link': {'type': 'string'},
+                                                             'device-name': {'type': 'string'},
                                                              'read-only': {'type': 'boolean'}},
                                               'type': 'object'},
                      'VolumeAttachmentParams': {'additionalProperties': False,
-                                                'properties': {'instanceid': {'type': 'string'},
-                                                               'machinetag': {'type': 'string'},
+                                                'properties': {'instance-id': {'type': 'string'},
+                                                               'machine-tag': {'type': 'string'},
                                                                'provider': {'type': 'string'},
                                                                'read-only': {'type': 'boolean'},
-                                                               'volumeid': {'type': 'string'},
-                                                               'volumetag': {'type': 'string'}},
-                                                'required': ['volumetag',
-                                                             'machinetag',
+                                                               'volume-id': {'type': 'string'},
+                                                               'volume-tag': {'type': 'string'}},
+                                                'required': ['volume-tag',
+                                                             'machine-tag',
                                                              'provider'],
                                                 'type': 'object'},
                      'VolumeAttachmentParamsResult': {'additionalProperties': False,
@@ -16760,16 +17933,16 @@ class StorageProvisionerFacade(Type):
                                                                             'type': 'array'}},
                                                  'type': 'object'},
                      'VolumeAttachments': {'additionalProperties': False,
-                                           'properties': {'volumeattachments': {'items': {'$ref': '#/definitions/VolumeAttachment'},
-                                                                                'type': 'array'}},
-                                           'required': ['volumeattachments'],
+                                           'properties': {'volume-attachments': {'items': {'$ref': '#/definitions/VolumeAttachment'},
+                                                                                 'type': 'array'}},
+                                           'required': ['volume-attachments'],
                                            'type': 'object'},
                      'VolumeInfo': {'additionalProperties': False,
-                                    'properties': {'hardwareid': {'type': 'string'},
+                                    'properties': {'hardware-id': {'type': 'string'},
                                                    'persistent': {'type': 'boolean'},
                                                    'size': {'type': 'integer'},
-                                                   'volumeid': {'type': 'string'}},
-                                    'required': ['volumeid', 'size', 'persistent'],
+                                                   'volume-id': {'type': 'string'}},
+                                    'required': ['volume-id', 'size', 'persistent'],
                                     'type': 'object'},
                      'VolumeParams': {'additionalProperties': False,
                                       'properties': {'attachment': {'$ref': '#/definitions/VolumeAttachmentParams'},
@@ -16780,8 +17953,10 @@ class StorageProvisionerFacade(Type):
                                                      'size': {'type': 'integer'},
                                                      'tags': {'patternProperties': {'.*': {'type': 'string'}},
                                                               'type': 'object'},
-                                                     'volumetag': {'type': 'string'}},
-                                      'required': ['volumetag', 'size', 'provider'],
+                                                     'volume-tag': {'type': 'string'}},
+                                      'required': ['volume-tag',
+                                                   'size',
+                                                   'provider'],
                                       'type': 'object'},
                      'VolumeParamsResult': {'additionalProperties': False,
                                             'properties': {'error': {'$ref': '#/definitions/Error'},
@@ -16805,21 +17980,7 @@ class StorageProvisionerFacade(Type):
                                  'properties': {'volumes': {'items': {'$ref': '#/definitions/Volume'},
                                                             'type': 'array'}},
                                  'required': ['volumes'],
-                                 'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                 'type': 'object'}},
      'properties': {'AttachmentLife': {'properties': {'Params': {'$ref': '#/definitions/MachineStorageIds'},
                                                       'Result': {'$ref': '#/definitions/LifeResults'}},
                                        'type': 'object'},
@@ -16844,8 +18005,6 @@ class StorageProvisionerFacade(Type):
                     'Life': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                             'Result': {'$ref': '#/definitions/LifeResults'}},
                              'type': 'object'},
-                    'ModelConfig': {'properties': {'Result': {'$ref': '#/definitions/ModelConfigResult'}},
-                                    'type': 'object'},
                     'Remove': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                               'Result': {'$ref': '#/definitions/ErrorResults'}},
                                'type': 'object'},
@@ -16894,8 +18053,6 @@ class StorageProvisionerFacade(Type):
                     'WatchFilesystems': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                         'Result': {'$ref': '#/definitions/StringsWatchResults'}},
                                          'type': 'object'},
-                    'WatchForModelConfigChanges': {'properties': {'Result': {'$ref': '#/definitions/NotifyWatchResult'}},
-                                                   'type': 'object'},
                     'WatchMachines': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                      'Result': {'$ref': '#/definitions/NotifyWatchResults'}},
                                       'type': 'object'},
@@ -16911,13 +18068,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(LifeResults)
     async def AttachmentLife(self, ids):
         '''
-        ids : typing.Sequence[~MachineStorageId]
-        Returns -> typing.Sequence[~LifeResult]
+        ids : typing.Sequence<+T_co>[~MachineStorageId]<~MachineStorageId>
+        Returns -> typing.Sequence<+T_co>[~LifeResult]<~LifeResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='AttachmentLife', Version=2, Params=params)
-        params['ids'] = ids
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='AttachmentLife', version=3, params=_params)
+        _params['ids'] = ids
         reply = await self.rpc(msg)
         return reply
 
@@ -16926,13 +18083,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def EnsureDead(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='EnsureDead', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='EnsureDead', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -16941,13 +18098,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(FilesystemAttachmentParamsResults)
     async def FilesystemAttachmentParams(self, ids):
         '''
-        ids : typing.Sequence[~MachineStorageId]
-        Returns -> typing.Sequence[~FilesystemAttachmentParamsResult]
+        ids : typing.Sequence<+T_co>[~MachineStorageId]<~MachineStorageId>
+        Returns -> typing.Sequence<+T_co>[~FilesystemAttachmentParamsResult]<~FilesystemAttachmentParamsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='FilesystemAttachmentParams', Version=2, Params=params)
-        params['ids'] = ids
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='FilesystemAttachmentParams', version=3, params=_params)
+        _params['ids'] = ids
         reply = await self.rpc(msg)
         return reply
 
@@ -16956,13 +18113,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(FilesystemAttachmentResults)
     async def FilesystemAttachments(self, ids):
         '''
-        ids : typing.Sequence[~MachineStorageId]
-        Returns -> typing.Sequence[~FilesystemAttachmentResult]
+        ids : typing.Sequence<+T_co>[~MachineStorageId]<~MachineStorageId>
+        Returns -> typing.Sequence<+T_co>[~FilesystemAttachmentResult]<~FilesystemAttachmentResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='FilesystemAttachments', Version=2, Params=params)
-        params['ids'] = ids
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='FilesystemAttachments', version=3, params=_params)
+        _params['ids'] = ids
         reply = await self.rpc(msg)
         return reply
 
@@ -16971,13 +18128,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(FilesystemParamsResults)
     async def FilesystemParams(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~FilesystemParamsResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~FilesystemParamsResult]<~FilesystemParamsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='FilesystemParams', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='FilesystemParams', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -16986,13 +18143,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(FilesystemResults)
     async def Filesystems(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~FilesystemResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~FilesystemResult]<~FilesystemResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='Filesystems', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='Filesystems', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17001,13 +18158,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(StringResults)
     async def InstanceId(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringResult]<~StringResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='InstanceId', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='InstanceId', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17016,28 +18173,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(LifeResults)
     async def Life(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~LifeResult]
-        '''
-        # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='Life', Version=2, Params=params)
-        params['Entities'] = entities
-        reply = await self.rpc(msg)
-        return reply
-
-
-
-    @ReturnMapping(ModelConfigResult)
-    async def ModelConfig(self):
-        '''
-
-        Returns -> typing.Mapping[str, typing.Any]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~LifeResult]<~LifeResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='ModelConfig', Version=2, Params=params)
-
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='Life', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17046,13 +18188,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def Remove(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='Remove', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='Remove', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17061,28 +18203,28 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def RemoveAttachment(self, ids):
         '''
-        ids : typing.Sequence[~MachineStorageId]
-        Returns -> typing.Sequence[~ErrorResult]
+        ids : typing.Sequence<+T_co>[~MachineStorageId]<~MachineStorageId>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='RemoveAttachment', Version=2, Params=params)
-        params['ids'] = ids
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='RemoveAttachment', version=3, params=_params)
+        _params['ids'] = ids
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(ErrorResults)
-    async def SetFilesystemAttachmentInfo(self, filesystemattachments):
+    async def SetFilesystemAttachmentInfo(self, filesystem_attachments):
         '''
-        filesystemattachments : typing.Sequence[~FilesystemAttachment]
-        Returns -> typing.Sequence[~ErrorResult]
+        filesystem_attachments : typing.Sequence<+T_co>[~FilesystemAttachment]<~FilesystemAttachment>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='SetFilesystemAttachmentInfo', Version=2, Params=params)
-        params['filesystemattachments'] = filesystemattachments
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='SetFilesystemAttachmentInfo', version=3, params=_params)
+        _params['filesystem-attachments'] = filesystem_attachments
         reply = await self.rpc(msg)
         return reply
 
@@ -17091,13 +18233,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetFilesystemInfo(self, filesystems):
         '''
-        filesystems : typing.Sequence[~Filesystem]
-        Returns -> typing.Sequence[~ErrorResult]
+        filesystems : typing.Sequence<+T_co>[~Filesystem]<~Filesystem>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='SetFilesystemInfo', Version=2, Params=params)
-        params['filesystems'] = filesystems
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='SetFilesystemInfo', version=3, params=_params)
+        _params['filesystems'] = filesystems
         reply = await self.rpc(msg)
         return reply
 
@@ -17106,28 +18248,28 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetStatus(self, entities):
         '''
-        entities : typing.Sequence[~EntityStatusArgs]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='SetStatus', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='SetStatus', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(ErrorResults)
-    async def SetVolumeAttachmentInfo(self, volumeattachments):
+    async def SetVolumeAttachmentInfo(self, volume_attachments):
         '''
-        volumeattachments : typing.Sequence[~VolumeAttachment]
-        Returns -> typing.Sequence[~ErrorResult]
+        volume_attachments : typing.Sequence<+T_co>[~VolumeAttachment]<~VolumeAttachment>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='SetVolumeAttachmentInfo', Version=2, Params=params)
-        params['volumeattachments'] = volumeattachments
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='SetVolumeAttachmentInfo', version=3, params=_params)
+        _params['volume-attachments'] = volume_attachments
         reply = await self.rpc(msg)
         return reply
 
@@ -17136,13 +18278,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetVolumeInfo(self, volumes):
         '''
-        volumes : typing.Sequence[~Volume]
-        Returns -> typing.Sequence[~ErrorResult]
+        volumes : typing.Sequence<+T_co>[~Volume]<~Volume>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='SetVolumeInfo', Version=2, Params=params)
-        params['volumes'] = volumes
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='SetVolumeInfo', version=3, params=_params)
+        _params['volumes'] = volumes
         reply = await self.rpc(msg)
         return reply
 
@@ -17151,13 +18293,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def UpdateStatus(self, entities):
         '''
-        entities : typing.Sequence[~EntityStatusArgs]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='UpdateStatus', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='UpdateStatus', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17166,13 +18308,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(VolumeAttachmentParamsResults)
     async def VolumeAttachmentParams(self, ids):
         '''
-        ids : typing.Sequence[~MachineStorageId]
-        Returns -> typing.Sequence[~VolumeAttachmentParamsResult]
+        ids : typing.Sequence<+T_co>[~MachineStorageId]<~MachineStorageId>
+        Returns -> typing.Sequence<+T_co>[~VolumeAttachmentParamsResult]<~VolumeAttachmentParamsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='VolumeAttachmentParams', Version=2, Params=params)
-        params['ids'] = ids
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='VolumeAttachmentParams', version=3, params=_params)
+        _params['ids'] = ids
         reply = await self.rpc(msg)
         return reply
 
@@ -17181,13 +18323,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(VolumeAttachmentResults)
     async def VolumeAttachments(self, ids):
         '''
-        ids : typing.Sequence[~MachineStorageId]
-        Returns -> typing.Sequence[~VolumeAttachmentResult]
+        ids : typing.Sequence<+T_co>[~MachineStorageId]<~MachineStorageId>
+        Returns -> typing.Sequence<+T_co>[~VolumeAttachmentResult]<~VolumeAttachmentResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='VolumeAttachments', Version=2, Params=params)
-        params['ids'] = ids
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='VolumeAttachments', version=3, params=_params)
+        _params['ids'] = ids
         reply = await self.rpc(msg)
         return reply
 
@@ -17196,13 +18338,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(BlockDeviceResults)
     async def VolumeBlockDevices(self, ids):
         '''
-        ids : typing.Sequence[~MachineStorageId]
-        Returns -> typing.Sequence[~BlockDeviceResult]
+        ids : typing.Sequence<+T_co>[~MachineStorageId]<~MachineStorageId>
+        Returns -> typing.Sequence<+T_co>[~BlockDeviceResult]<~BlockDeviceResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='VolumeBlockDevices', Version=2, Params=params)
-        params['ids'] = ids
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='VolumeBlockDevices', version=3, params=_params)
+        _params['ids'] = ids
         reply = await self.rpc(msg)
         return reply
 
@@ -17211,13 +18353,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(VolumeParamsResults)
     async def VolumeParams(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~VolumeParamsResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~VolumeParamsResult]<~VolumeParamsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='VolumeParams', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='VolumeParams', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17226,13 +18368,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(VolumeResults)
     async def Volumes(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~VolumeResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~VolumeResult]<~VolumeResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='Volumes', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='Volumes', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17241,13 +18383,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def WatchBlockDevices(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='WatchBlockDevices', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='WatchBlockDevices', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17256,13 +18398,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(MachineStorageIdsWatchResults)
     async def WatchFilesystemAttachments(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~MachineStorageIdsWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~MachineStorageIdsWatchResult]<~MachineStorageIdsWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='WatchFilesystemAttachments', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='WatchFilesystemAttachments', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17271,28 +18413,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(StringsWatchResults)
     async def WatchFilesystems(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringsWatchResult]
-        '''
-        # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='WatchFilesystems', Version=2, Params=params)
-        params['Entities'] = entities
-        reply = await self.rpc(msg)
-        return reply
-
-
-
-    @ReturnMapping(NotifyWatchResult)
-    async def WatchForModelConfigChanges(self):
-        '''
-
-        Returns -> typing.Union[_ForwardRef('Error'), str]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringsWatchResult]<~StringsWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='WatchForModelConfigChanges', Version=2, Params=params)
-
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='WatchFilesystems', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17301,13 +18428,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def WatchMachines(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='WatchMachines', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='WatchMachines', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17316,13 +18443,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(MachineStorageIdsWatchResults)
     async def WatchVolumeAttachments(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~MachineStorageIdsWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~MachineStorageIdsWatchResult]<~MachineStorageIdsWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='WatchVolumeAttachments', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='WatchVolumeAttachments', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17331,13 +18458,13 @@ class StorageProvisionerFacade(Type):
     @ReturnMapping(StringsWatchResults)
     async def WatchVolumes(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringsWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringsWatchResult]<~StringsWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StorageProvisioner', Request='WatchVolumes', Version=2, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='StorageProvisioner', request='WatchVolumes', version=3, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17346,53 +18473,23 @@ class StringsWatcherFacade(Type):
     name = 'StringsWatcher'
     version = 1
     schema =     {'definitions': {'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'StringsWatchResult': {'additionalProperties': False,
-                                            'properties': {'Changes': {'items': {'type': 'string'},
+                                            'properties': {'changes': {'items': {'type': 'string'},
                                                                        'type': 'array'},
-                                                           'Error': {'$ref': '#/definitions/Error'},
-                                                           'StringsWatcherId': {'type': 'string'}},
-                                            'required': ['StringsWatcherId',
-                                                         'Changes',
-                                                         'Error'],
-                                            'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                                           'error': {'$ref': '#/definitions/Error'},
+                                                           'watcher-id': {'type': 'string'}},
+                                            'required': ['watcher-id'],
+                                            'type': 'object'}},
      'properties': {'Next': {'properties': {'Result': {'$ref': '#/definitions/StringsWatchResult'}},
                              'type': 'object'},
                     'Stop': {'type': 'object'}},
@@ -17403,11 +18500,11 @@ class StringsWatcherFacade(Type):
     async def Next(self):
         '''
 
-        Returns -> typing.Union[typing.Sequence[str], _ForwardRef('Error')]
+        Returns -> typing.Union[typing.Sequence<+T_co>[str], _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StringsWatcher', Request='Next', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='StringsWatcher', request='Next', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -17421,8 +18518,8 @@ class StringsWatcherFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='StringsWatcher', Request='Stop', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='StringsWatcher', request='Stop', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -17432,115 +18529,82 @@ class SubnetsFacade(Type):
     name = 'Subnets'
     version = 2
     schema =     {'definitions': {'AddSubnetParams': {'additionalProperties': False,
-                                         'properties': {'SpaceTag': {'type': 'string'},
-                                                        'SubnetProviderId': {'type': 'string'},
-                                                        'SubnetTag': {'type': 'string'},
-                                                        'Zones': {'items': {'type': 'string'},
+                                         'properties': {'space-tag': {'type': 'string'},
+                                                        'subnet-provider-id': {'type': 'string'},
+                                                        'subnet-tag': {'type': 'string'},
+                                                        'zones': {'items': {'type': 'string'},
                                                                   'type': 'array'}},
-                                         'required': ['SpaceTag'],
+                                         'required': ['space-tag'],
                                          'type': 'object'},
                      'AddSubnetsParams': {'additionalProperties': False,
-                                          'properties': {'Subnets': {'items': {'$ref': '#/definitions/AddSubnetParams'},
+                                          'properties': {'subnets': {'items': {'$ref': '#/definitions/AddSubnetParams'},
                                                                      'type': 'array'}},
-                                          'required': ['Subnets'],
+                                          'required': ['subnets'],
                                           'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'ListSubnetsResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/Subnet'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/Subnet'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
+                                            'required': ['results'],
                                             'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'SpaceResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                    'Tag': {'type': 'string'}},
-                                     'required': ['Error', 'Tag'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                    'tag': {'type': 'string'}},
+                                     'required': ['tag'],
                                      'type': 'object'},
                      'SpaceResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/SpaceResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/SpaceResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'Subnet': {'additionalProperties': False,
-                                'properties': {'CIDR': {'type': 'string'},
-                                               'Life': {'type': 'string'},
-                                               'ProviderId': {'type': 'string'},
-                                               'SpaceTag': {'type': 'string'},
-                                               'StaticRangeHighIP': {'items': {'type': 'integer'},
-                                                                     'type': 'array'},
-                                               'StaticRangeLowIP': {'items': {'type': 'integer'},
-                                                                    'type': 'array'},
-                                               'Status': {'type': 'string'},
-                                               'VLANTag': {'type': 'integer'},
-                                               'Zones': {'items': {'type': 'string'},
+                                'properties': {'cidr': {'type': 'string'},
+                                               'life': {'type': 'string'},
+                                               'provider-id': {'type': 'string'},
+                                               'space-tag': {'type': 'string'},
+                                               'status': {'type': 'string'},
+                                               'vlan-tag': {'type': 'integer'},
+                                               'zones': {'items': {'type': 'string'},
                                                          'type': 'array'}},
-                                'required': ['CIDR',
-                                             'VLANTag',
-                                             'Life',
-                                             'SpaceTag',
-                                             'Zones'],
+                                'required': ['cidr',
+                                             'vlan-tag',
+                                             'life',
+                                             'space-tag',
+                                             'zones'],
                                 'type': 'object'},
                      'SubnetsFilters': {'additionalProperties': False,
-                                        'properties': {'SpaceTag': {'type': 'string'},
-                                                       'Zone': {'type': 'string'}},
+                                        'properties': {'space-tag': {'type': 'string'},
+                                                       'zone': {'type': 'string'}},
                                         'type': 'object'},
                      'ZoneResult': {'additionalProperties': False,
-                                    'properties': {'Available': {'type': 'boolean'},
-                                                   'Error': {'$ref': '#/definitions/Error'},
-                                                   'Name': {'type': 'string'}},
-                                    'required': ['Error', 'Name', 'Available'],
+                                    'properties': {'available': {'type': 'boolean'},
+                                                   'error': {'$ref': '#/definitions/Error'},
+                                                   'name': {'type': 'string'}},
+                                    'required': ['name', 'available'],
                                     'type': 'object'},
                      'ZoneResults': {'additionalProperties': False,
-                                     'properties': {'Results': {'items': {'$ref': '#/definitions/ZoneResult'},
+                                     'properties': {'results': {'items': {'$ref': '#/definitions/ZoneResult'},
                                                                 'type': 'array'}},
-                                     'required': ['Results'],
-                                     'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                     'required': ['results'],
+                                     'type': 'object'}},
      'properties': {'AddSubnets': {'properties': {'Params': {'$ref': '#/definitions/AddSubnetsParams'},
                                                   'Result': {'$ref': '#/definitions/ErrorResults'}},
                                    'type': 'object'},
@@ -17557,13 +18621,13 @@ class SubnetsFacade(Type):
     @ReturnMapping(ErrorResults)
     async def AddSubnets(self, subnets):
         '''
-        subnets : typing.Sequence[~AddSubnetParams]
-        Returns -> typing.Sequence[~ErrorResult]
+        subnets : typing.Sequence<+T_co>[~AddSubnetParams]<~AddSubnetParams>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Subnets', Request='AddSubnets', Version=2, Params=params)
-        params['Subnets'] = subnets
+        _params = dict()
+        msg = dict(type='Subnets', request='AddSubnets', version=2, params=_params)
+        _params['subnets'] = subnets
         reply = await self.rpc(msg)
         return reply
 
@@ -17573,11 +18637,11 @@ class SubnetsFacade(Type):
     async def AllSpaces(self):
         '''
 
-        Returns -> typing.Sequence[~SpaceResult]
+        Returns -> typing.Sequence<+T_co>[~SpaceResult]<~SpaceResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Subnets', Request='AllSpaces', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='Subnets', request='AllSpaces', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -17588,11 +18652,11 @@ class SubnetsFacade(Type):
     async def AllZones(self):
         '''
 
-        Returns -> typing.Sequence[~ZoneResult]
+        Returns -> typing.Sequence<+T_co>[~ZoneResult]<~ZoneResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Subnets', Request='AllZones', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='Subnets', request='AllZones', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -17600,17 +18664,17 @@ class SubnetsFacade(Type):
 
 
     @ReturnMapping(ListSubnetsResults)
-    async def ListSubnets(self, spacetag, zone):
+    async def ListSubnets(self, space_tag, zone):
         '''
-        spacetag : str
+        space_tag : str
         zone : str
-        Returns -> typing.Sequence[~Subnet]
+        Returns -> typing.Sequence<+T_co>[~Subnet]<~Subnet>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Subnets', Request='ListSubnets', Version=2, Params=params)
-        params['SpaceTag'] = spacetag
-        params['Zone'] = zone
+        _params = dict()
+        msg = dict(type='Subnets', request='ListSubnets', version=2, params=_params)
+        _params['space-tag'] = space_tag
+        _params['zone'] = zone
         reply = await self.rpc(msg)
         return reply
 
@@ -17619,103 +18683,74 @@ class UndertakerFacade(Type):
     name = 'Undertaker'
     version = 1
     schema =     {'definitions': {'EntityStatusArgs': {'additionalProperties': False,
-                                          'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True,
+                                          'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                'type': 'object'}},
                                                                   'type': 'object'},
-                                                         'Info': {'type': 'string'},
-                                                         'Status': {'type': 'string'},
-                                                         'Tag': {'type': 'string'}},
-                                          'required': ['Tag',
-                                                       'Status',
-                                                       'Info',
-                                                       'Data'],
+                                                         'info': {'type': 'string'},
+                                                         'status': {'type': 'string'},
+                                                         'tag': {'type': 'string'}},
+                                          'required': ['tag',
+                                                       'status',
+                                                       'info',
+                                                       'data'],
                                           'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'ModelConfigResult': {'additionalProperties': False,
-                                           'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                           'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                   'type': 'object'}},
                                                                      'type': 'object'}},
-                                           'required': ['Config'],
+                                           'required': ['config'],
                                            'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
                      'NotifyWatchResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
+                                            'required': ['results'],
                                             'type': 'object'},
                      'SetStatus': {'additionalProperties': False,
-                                   'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'},
+                                   'properties': {'entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'},
                                                                'type': 'array'}},
-                                   'required': ['Entities'],
+                                   'required': ['entities'],
                                    'type': 'object'},
                      'UndertakerModelInfo': {'additionalProperties': False,
-                                             'properties': {'GlobalName': {'type': 'string'},
-                                                            'IsSystem': {'type': 'boolean'},
-                                                            'Life': {'type': 'string'},
-                                                            'Name': {'type': 'string'},
-                                                            'UUID': {'type': 'string'}},
-                                             'required': ['UUID',
-                                                          'Name',
-                                                          'GlobalName',
-                                                          'IsSystem',
-                                                          'Life'],
+                                             'properties': {'global-name': {'type': 'string'},
+                                                            'is-system': {'type': 'boolean'},
+                                                            'life': {'type': 'string'},
+                                                            'name': {'type': 'string'},
+                                                            'uuid': {'type': 'string'}},
+                                             'required': ['uuid',
+                                                          'name',
+                                                          'global-name',
+                                                          'is-system',
+                                                          'life'],
                                              'type': 'object'},
                      'UndertakerModelInfoResult': {'additionalProperties': False,
-                                                   'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                                  'Result': {'$ref': '#/definitions/UndertakerModelInfo'}},
-                                                   'required': ['Error', 'Result'],
-                                                   'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                                   'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                                  'result': {'$ref': '#/definitions/UndertakerModelInfo'}},
+                                                   'required': ['result'],
+                                                   'type': 'object'}},
      'properties': {'ModelConfig': {'properties': {'Result': {'$ref': '#/definitions/ModelConfigResult'}},
                                     'type': 'object'},
                     'ModelInfo': {'properties': {'Result': {'$ref': '#/definitions/UndertakerModelInfoResult'}},
@@ -17737,11 +18772,11 @@ class UndertakerFacade(Type):
     async def ModelConfig(self):
         '''
 
-        Returns -> typing.Mapping[str, typing.Any]
+        Returns -> typing.Mapping<~KT, +VT_co>[str, typing.Any]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Undertaker', Request='ModelConfig', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Undertaker', request='ModelConfig', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -17755,8 +18790,8 @@ class UndertakerFacade(Type):
         Returns -> typing.Union[_ForwardRef('Error'), _ForwardRef('UndertakerModelInfo')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Undertaker', Request='ModelInfo', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Undertaker', request='ModelInfo', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -17770,8 +18805,8 @@ class UndertakerFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Undertaker', Request='ProcessDyingModel', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Undertaker', request='ProcessDyingModel', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -17785,8 +18820,8 @@ class UndertakerFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Undertaker', Request='RemoveModel', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Undertaker', request='RemoveModel', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -17796,13 +18831,13 @@ class UndertakerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetStatus(self, entities):
         '''
-        entities : typing.Sequence[~EntityStatusArgs]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Undertaker', Request='SetStatus', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Undertaker', request='SetStatus', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17811,13 +18846,13 @@ class UndertakerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def UpdateStatus(self, entities):
         '''
-        entities : typing.Sequence[~EntityStatusArgs]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Undertaker', Request='UpdateStatus', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Undertaker', request='UpdateStatus', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17827,11 +18862,11 @@ class UndertakerFacade(Type):
     async def WatchModelResources(self):
         '''
 
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Undertaker', Request='WatchModelResources', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='Undertaker', request='WatchModelResources', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -17841,88 +18876,57 @@ class UnitAssignerFacade(Type):
     name = 'UnitAssigner'
     version = 1
     schema =     {'definitions': {'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'EntityStatusArgs': {'additionalProperties': False,
-                                          'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True,
+                                          'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                'type': 'object'}},
                                                                   'type': 'object'},
-                                                         'Info': {'type': 'string'},
-                                                         'Status': {'type': 'string'},
-                                                         'Tag': {'type': 'string'}},
-                                          'required': ['Tag',
-                                                       'Status',
-                                                       'Info',
-                                                       'Data'],
+                                                         'info': {'type': 'string'},
+                                                         'status': {'type': 'string'},
+                                                         'tag': {'type': 'string'}},
+                                          'required': ['tag',
+                                                       'status',
+                                                       'info',
+                                                       'data'],
                                           'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'SetStatus': {'additionalProperties': False,
-                                   'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'},
+                                   'properties': {'entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'},
                                                                'type': 'array'}},
-                                   'required': ['Entities'],
+                                   'required': ['entities'],
                                    'type': 'object'},
                      'StringsWatchResult': {'additionalProperties': False,
-                                            'properties': {'Changes': {'items': {'type': 'string'},
+                                            'properties': {'changes': {'items': {'type': 'string'},
                                                                        'type': 'array'},
-                                                           'Error': {'$ref': '#/definitions/Error'},
-                                                           'StringsWatcherId': {'type': 'string'}},
-                                            'required': ['StringsWatcherId',
-                                                         'Changes',
-                                                         'Error'],
-                                            'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                                           'error': {'$ref': '#/definitions/Error'},
+                                                           'watcher-id': {'type': 'string'}},
+                                            'required': ['watcher-id'],
+                                            'type': 'object'}},
      'properties': {'AssignUnits': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                    'Result': {'$ref': '#/definitions/ErrorResults'}},
                                     'type': 'object'},
@@ -17937,13 +18941,13 @@ class UnitAssignerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def AssignUnits(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='UnitAssigner', Request='AssignUnits', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='UnitAssigner', request='AssignUnits', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17952,13 +18956,13 @@ class UnitAssignerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetAgentStatus(self, entities):
         '''
-        entities : typing.Sequence[~EntityStatusArgs]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='UnitAssigner', Request='SetAgentStatus', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='UnitAssigner', request='SetAgentStatus', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -17968,11 +18972,11 @@ class UnitAssignerFacade(Type):
     async def WatchUnitAssignments(self):
         '''
 
-        Returns -> typing.Union[typing.Sequence[str], _ForwardRef('Error')]
+        Returns -> typing.Union[typing.Sequence<+T_co>[str], _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='UnitAssigner', Request='WatchUnitAssignments', Version=1, Params=params)
+        _params = dict()
+        msg = dict(type='UnitAssigner', request='WatchUnitAssignments', version=1, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -17982,10 +18986,10 @@ class UniterFacade(Type):
     name = 'Uniter'
     version = 4
     schema =     {'definitions': {'APIHostPortsResult': {'additionalProperties': False,
-                                            'properties': {'Servers': {'items': {'items': {'$ref': '#/definitions/HostPort'},
+                                            'properties': {'servers': {'items': {'items': {'$ref': '#/definitions/HostPort'},
                                                                                  'type': 'array'},
                                                                        'type': 'array'}},
-                                            'required': ['Servers'],
+                                            'required': ['servers'],
                                             'type': 'object'},
                      'Action': {'additionalProperties': False,
                                 'properties': {'name': {'type': 'string'},
@@ -17997,13 +19001,13 @@ class UniterFacade(Type):
                                 'required': ['tag', 'receiver', 'name'],
                                 'type': 'object'},
                      'ActionExecutionResult': {'additionalProperties': False,
-                                               'properties': {'actiontag': {'type': 'string'},
+                                               'properties': {'action-tag': {'type': 'string'},
                                                               'message': {'type': 'string'},
                                                               'results': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                        'type': 'object'}},
                                                                           'type': 'object'},
                                                               'status': {'type': 'string'}},
-                                               'required': ['actiontag', 'status'],
+                                               'required': ['action-tag', 'status'],
                                                'type': 'object'},
                      'ActionExecutionResults': {'additionalProperties': False,
                                                 'properties': {'results': {'items': {'$ref': '#/definitions/ActionExecutionResult'},
@@ -18029,490 +19033,480 @@ class UniterFacade(Type):
                                                                   'type': 'array'}},
                                        'type': 'object'},
                      'Address': {'additionalProperties': False,
-                                 'properties': {'Scope': {'type': 'string'},
-                                                'SpaceName': {'type': 'string'},
-                                                'Type': {'type': 'string'},
-                                                'Value': {'type': 'string'}},
-                                 'required': ['Value', 'Type', 'Scope'],
+                                 'properties': {'scope': {'type': 'string'},
+                                                'space-name': {'type': 'string'},
+                                                'type': {'type': 'string'},
+                                                'value': {'type': 'string'}},
+                                 'required': ['value', 'type', 'scope'],
                                  'type': 'object'},
                      'ApplicationStatusResult': {'additionalProperties': False,
-                                                 'properties': {'Application': {'$ref': '#/definitions/StatusResult'},
-                                                                'Error': {'$ref': '#/definitions/Error'},
-                                                                'Units': {'patternProperties': {'.*': {'$ref': '#/definitions/StatusResult'}},
+                                                 'properties': {'application': {'$ref': '#/definitions/StatusResult'},
+                                                                'error': {'$ref': '#/definitions/Error'},
+                                                                'units': {'patternProperties': {'.*': {'$ref': '#/definitions/StatusResult'}},
                                                                           'type': 'object'}},
-                                                 'required': ['Application',
-                                                              'Units',
-                                                              'Error'],
+                                                 'required': ['application',
+                                                              'units'],
                                                  'type': 'object'},
                      'ApplicationStatusResults': {'additionalProperties': False,
-                                                  'properties': {'Results': {'items': {'$ref': '#/definitions/ApplicationStatusResult'},
+                                                  'properties': {'results': {'items': {'$ref': '#/definitions/ApplicationStatusResult'},
                                                                              'type': 'array'}},
-                                                  'required': ['Results'],
+                                                  'required': ['results'],
                                                   'type': 'object'},
                      'BoolResult': {'additionalProperties': False,
-                                    'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                   'Result': {'type': 'boolean'}},
-                                    'required': ['Error', 'Result'],
+                                    'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                   'result': {'type': 'boolean'}},
+                                    'required': ['result'],
                                     'type': 'object'},
                      'BoolResults': {'additionalProperties': False,
-                                     'properties': {'Results': {'items': {'$ref': '#/definitions/BoolResult'},
+                                     'properties': {'results': {'items': {'$ref': '#/definitions/BoolResult'},
                                                                 'type': 'array'}},
-                                     'required': ['Results'],
+                                     'required': ['results'],
                                      'type': 'object'},
                      'BytesResult': {'additionalProperties': False,
-                                     'properties': {'Result': {'items': {'type': 'integer'},
+                                     'properties': {'result': {'items': {'type': 'integer'},
                                                                'type': 'array'}},
-                                     'required': ['Result'],
+                                     'required': ['result'],
                                      'type': 'object'},
+                     'CharmRelation': {'additionalProperties': False,
+                                       'properties': {'interface': {'type': 'string'},
+                                                      'limit': {'type': 'integer'},
+                                                      'name': {'type': 'string'},
+                                                      'optional': {'type': 'boolean'},
+                                                      'role': {'type': 'string'},
+                                                      'scope': {'type': 'string'}},
+                                       'required': ['name',
+                                                    'role',
+                                                    'interface',
+                                                    'optional',
+                                                    'limit',
+                                                    'scope'],
+                                       'type': 'object'},
                      'CharmURL': {'additionalProperties': False,
-                                  'properties': {'URL': {'type': 'string'}},
-                                  'required': ['URL'],
+                                  'properties': {'url': {'type': 'string'}},
+                                  'required': ['url'],
                                   'type': 'object'},
                      'CharmURLs': {'additionalProperties': False,
-                                   'properties': {'URLs': {'items': {'$ref': '#/definitions/CharmURL'},
+                                   'properties': {'urls': {'items': {'$ref': '#/definitions/CharmURL'},
                                                            'type': 'array'}},
-                                   'required': ['URLs'],
+                                   'required': ['urls'],
                                    'type': 'object'},
                      'ConfigSettingsResult': {'additionalProperties': False,
-                                              'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                             'Settings': {'patternProperties': {'.*': {'additionalProperties': True,
+                                              'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                             'settings': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                        'type': 'object'}},
                                                                           'type': 'object'}},
-                                              'required': ['Error', 'Settings'],
+                                              'required': ['settings'],
                                               'type': 'object'},
                      'ConfigSettingsResults': {'additionalProperties': False,
-                                               'properties': {'Results': {'items': {'$ref': '#/definitions/ConfigSettingsResult'},
+                                               'properties': {'results': {'items': {'$ref': '#/definitions/ConfigSettingsResult'},
                                                                           'type': 'array'}},
-                                               'required': ['Results'],
+                                               'required': ['results'],
                                                'type': 'object'},
                      'Endpoint': {'additionalProperties': False,
-                                  'properties': {'ApplicationName': {'type': 'string'},
-                                                 'Relation': {'$ref': '#/definitions/Relation'}},
-                                  'required': ['ApplicationName', 'Relation'],
+                                  'properties': {'application-name': {'type': 'string'},
+                                                 'relation': {'$ref': '#/definitions/CharmRelation'}},
+                                  'required': ['application-name', 'relation'],
                                   'type': 'object'},
                      'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'EntitiesCharmURL': {'additionalProperties': False,
-                                          'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityCharmURL'},
+                                          'properties': {'entities': {'items': {'$ref': '#/definitions/EntityCharmURL'},
                                                                       'type': 'array'}},
-                                          'required': ['Entities'],
+                                          'required': ['entities'],
                                           'type': 'object'},
                      'EntitiesPortRanges': {'additionalProperties': False,
-                                            'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityPortRange'},
+                                            'properties': {'entities': {'items': {'$ref': '#/definitions/EntityPortRange'},
                                                                         'type': 'array'}},
-                                            'required': ['Entities'],
+                                            'required': ['entities'],
                                             'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'EntityCharmURL': {'additionalProperties': False,
-                                        'properties': {'CharmURL': {'type': 'string'},
-                                                       'Tag': {'type': 'string'}},
-                                        'required': ['Tag', 'CharmURL'],
+                                        'properties': {'charm-url': {'type': 'string'},
+                                                       'tag': {'type': 'string'}},
+                                        'required': ['tag', 'charm-url'],
                                         'type': 'object'},
                      'EntityPortRange': {'additionalProperties': False,
-                                         'properties': {'FromPort': {'type': 'integer'},
-                                                        'Protocol': {'type': 'string'},
-                                                        'Tag': {'type': 'string'},
-                                                        'ToPort': {'type': 'integer'}},
-                                         'required': ['Tag',
-                                                      'Protocol',
-                                                      'FromPort',
-                                                      'ToPort'],
+                                         'properties': {'from-port': {'type': 'integer'},
+                                                        'protocol': {'type': 'string'},
+                                                        'tag': {'type': 'string'},
+                                                        'to-port': {'type': 'integer'}},
+                                         'required': ['tag',
+                                                      'protocol',
+                                                      'from-port',
+                                                      'to-port'],
                                          'type': 'object'},
                      'EntityStatusArgs': {'additionalProperties': False,
-                                          'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True,
+                                          'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                'type': 'object'}},
                                                                   'type': 'object'},
-                                                         'Info': {'type': 'string'},
-                                                         'Status': {'type': 'string'},
-                                                         'Tag': {'type': 'string'}},
-                                          'required': ['Tag',
-                                                       'Status',
-                                                       'Info',
-                                                       'Data'],
+                                                         'info': {'type': 'string'},
+                                                         'status': {'type': 'string'},
+                                                         'tag': {'type': 'string'}},
+                                          'required': ['tag',
+                                                       'status',
+                                                       'info',
+                                                       'data'],
                                           'type': 'object'},
+                     'EntityWorkloadVersion': {'additionalProperties': False,
+                                               'properties': {'tag': {'type': 'string'},
+                                                              'workload-version': {'type': 'string'}},
+                                               'required': ['tag',
+                                                            'workload-version'],
+                                               'type': 'object'},
+                     'EntityWorkloadVersions': {'additionalProperties': False,
+                                                'properties': {'entities': {'items': {'$ref': '#/definitions/EntityWorkloadVersion'},
+                                                                            'type': 'array'}},
+                                                'required': ['entities'],
+                                                'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'GetLeadershipSettingsBulkResults': {'additionalProperties': False,
-                                                          'properties': {'Results': {'items': {'$ref': '#/definitions/GetLeadershipSettingsResult'},
+                                                          'properties': {'results': {'items': {'$ref': '#/definitions/GetLeadershipSettingsResult'},
                                                                                      'type': 'array'}},
-                                                          'required': ['Results'],
+                                                          'required': ['results'],
                                                           'type': 'object'},
                      'GetLeadershipSettingsResult': {'additionalProperties': False,
-                                                     'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                                    'Settings': {'patternProperties': {'.*': {'type': 'string'}},
+                                                     'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                                    'settings': {'patternProperties': {'.*': {'type': 'string'}},
                                                                                  'type': 'object'}},
-                                                     'required': ['Settings',
-                                                                  'Error'],
+                                                     'required': ['settings'],
                                                      'type': 'object'},
                      'HostPort': {'additionalProperties': False,
                                   'properties': {'Address': {'$ref': '#/definitions/Address'},
-                                                 'Port': {'type': 'integer'}},
-                                  'required': ['Address', 'Port'],
+                                                 'port': {'type': 'integer'}},
+                                  'required': ['Address', 'port'],
                                   'type': 'object'},
                      'IntResult': {'additionalProperties': False,
-                                   'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                  'Result': {'type': 'integer'}},
-                                   'required': ['Error', 'Result'],
+                                   'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                  'result': {'type': 'integer'}},
+                                   'required': ['result'],
                                    'type': 'object'},
                      'IntResults': {'additionalProperties': False,
-                                    'properties': {'Results': {'items': {'$ref': '#/definitions/IntResult'},
+                                    'properties': {'results': {'items': {'$ref': '#/definitions/IntResult'},
                                                                'type': 'array'}},
-                                    'required': ['Results'],
+                                    'required': ['results'],
                                     'type': 'object'},
                      'LifeResult': {'additionalProperties': False,
-                                    'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                   'Life': {'type': 'string'}},
-                                    'required': ['Life', 'Error'],
+                                    'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                   'life': {'type': 'string'}},
+                                    'required': ['life'],
                                     'type': 'object'},
                      'LifeResults': {'additionalProperties': False,
-                                     'properties': {'Results': {'items': {'$ref': '#/definitions/LifeResult'},
+                                     'properties': {'results': {'items': {'$ref': '#/definitions/LifeResult'},
                                                                 'type': 'array'}},
-                                     'required': ['Results'],
+                                     'required': ['results'],
                                      'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'MachinePortRange': {'additionalProperties': False,
-                                          'properties': {'PortRange': {'$ref': '#/definitions/PortRange'},
-                                                         'RelationTag': {'type': 'string'},
-                                                         'UnitTag': {'type': 'string'}},
-                                          'required': ['UnitTag',
-                                                       'RelationTag',
-                                                       'PortRange'],
+                                          'properties': {'port-range': {'$ref': '#/definitions/PortRange'},
+                                                         'relation-tag': {'type': 'string'},
+                                                         'unit-tag': {'type': 'string'}},
+                                          'required': ['unit-tag',
+                                                       'relation-tag',
+                                                       'port-range'],
                                           'type': 'object'},
                      'MachinePortsResult': {'additionalProperties': False,
-                                            'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                           'Ports': {'items': {'$ref': '#/definitions/MachinePortRange'},
+                                            'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                           'ports': {'items': {'$ref': '#/definitions/MachinePortRange'},
                                                                      'type': 'array'}},
-                                            'required': ['Error', 'Ports'],
+                                            'required': ['ports'],
                                             'type': 'object'},
                      'MachinePortsResults': {'additionalProperties': False,
-                                             'properties': {'Results': {'items': {'$ref': '#/definitions/MachinePortsResult'},
+                                             'properties': {'results': {'items': {'$ref': '#/definitions/MachinePortsResult'},
                                                                         'type': 'array'}},
-                                             'required': ['Results'],
+                                             'required': ['results'],
                                              'type': 'object'},
                      'MergeLeadershipSettingsBulkParams': {'additionalProperties': False,
-                                                           'properties': {'Params': {'items': {'$ref': '#/definitions/MergeLeadershipSettingsParam'},
+                                                           'properties': {'params': {'items': {'$ref': '#/definitions/MergeLeadershipSettingsParam'},
                                                                                      'type': 'array'}},
-                                                           'required': ['Params'],
+                                                           'required': ['params'],
                                                            'type': 'object'},
                      'MergeLeadershipSettingsParam': {'additionalProperties': False,
-                                                      'properties': {'ApplicationTag': {'type': 'string'},
-                                                                     'Settings': {'patternProperties': {'.*': {'type': 'string'}},
+                                                      'properties': {'application-tag': {'type': 'string'},
+                                                                     'settings': {'patternProperties': {'.*': {'type': 'string'}},
                                                                                   'type': 'object'}},
-                                                      'required': ['ApplicationTag',
-                                                                   'Settings'],
+                                                      'required': ['application-tag',
+                                                                   'settings'],
                                                       'type': 'object'},
                      'MeterStatusResult': {'additionalProperties': False,
-                                           'properties': {'Code': {'type': 'string'},
-                                                          'Error': {'$ref': '#/definitions/Error'},
-                                                          'Info': {'type': 'string'}},
-                                           'required': ['Code', 'Info', 'Error'],
+                                           'properties': {'code': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'},
+                                                          'info': {'type': 'string'}},
+                                           'required': ['code', 'info'],
                                            'type': 'object'},
                      'MeterStatusResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/MeterStatusResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/MeterStatusResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
+                                            'required': ['results'],
                                             'type': 'object'},
                      'Metric': {'additionalProperties': False,
-                                'properties': {'Key': {'type': 'string'},
-                                               'Time': {'format': 'date-time',
+                                'properties': {'key': {'type': 'string'},
+                                               'time': {'format': 'date-time',
                                                         'type': 'string'},
-                                               'Value': {'type': 'string'}},
-                                'required': ['Key', 'Value', 'Time'],
+                                               'value': {'type': 'string'}},
+                                'required': ['key', 'value', 'time'],
                                 'type': 'object'},
                      'MetricBatch': {'additionalProperties': False,
-                                     'properties': {'CharmURL': {'type': 'string'},
-                                                    'Created': {'format': 'date-time',
+                                     'properties': {'charm-url': {'type': 'string'},
+                                                    'created': {'format': 'date-time',
                                                                 'type': 'string'},
-                                                    'Metrics': {'items': {'$ref': '#/definitions/Metric'},
+                                                    'metrics': {'items': {'$ref': '#/definitions/Metric'},
                                                                 'type': 'array'},
-                                                    'UUID': {'type': 'string'}},
-                                     'required': ['UUID',
-                                                  'CharmURL',
-                                                  'Created',
-                                                  'Metrics'],
+                                                    'uuid': {'type': 'string'}},
+                                     'required': ['uuid',
+                                                  'charm-url',
+                                                  'created',
+                                                  'metrics'],
                                      'type': 'object'},
                      'MetricBatchParam': {'additionalProperties': False,
-                                          'properties': {'Batch': {'$ref': '#/definitions/MetricBatch'},
-                                                         'Tag': {'type': 'string'}},
-                                          'required': ['Tag', 'Batch'],
+                                          'properties': {'batch': {'$ref': '#/definitions/MetricBatch'},
+                                                         'tag': {'type': 'string'}},
+                                          'required': ['tag', 'batch'],
                                           'type': 'object'},
                      'MetricBatchParams': {'additionalProperties': False,
-                                           'properties': {'Batches': {'items': {'$ref': '#/definitions/MetricBatchParam'},
+                                           'properties': {'batches': {'items': {'$ref': '#/definitions/MetricBatchParam'},
                                                                       'type': 'array'}},
-                                           'required': ['Batches'],
+                                           'required': ['batches'],
                                            'type': 'object'},
                      'ModelConfigResult': {'additionalProperties': False,
-                                           'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True,
+                                           'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                                   'type': 'object'}},
                                                                      'type': 'object'}},
-                                           'required': ['Config'],
+                                           'required': ['config'],
                                            'type': 'object'},
                      'ModelResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                    'Name': {'type': 'string'},
-                                                    'UUID': {'type': 'string'}},
-                                     'required': ['Error', 'Name', 'UUID'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                    'name': {'type': 'string'},
+                                                    'uuid': {'type': 'string'}},
+                                     'required': ['name', 'uuid'],
                                      'type': 'object'},
                      'NetworkConfig': {'additionalProperties': False,
-                                       'properties': {'Address': {'type': 'string'},
-                                                      'CIDR': {'type': 'string'},
-                                                      'ConfigType': {'type': 'string'},
-                                                      'DNSSearchDomains': {'items': {'type': 'string'},
-                                                                           'type': 'array'},
-                                                      'DNSServers': {'items': {'type': 'string'},
-                                                                     'type': 'array'},
-                                                      'DeviceIndex': {'type': 'integer'},
-                                                      'Disabled': {'type': 'boolean'},
-                                                      'GatewayAddress': {'type': 'string'},
-                                                      'InterfaceName': {'type': 'string'},
-                                                      'InterfaceType': {'type': 'string'},
-                                                      'MACAddress': {'type': 'string'},
-                                                      'MTU': {'type': 'integer'},
-                                                      'NoAutoStart': {'type': 'boolean'},
-                                                      'ParentInterfaceName': {'type': 'string'},
-                                                      'ProviderAddressId': {'type': 'string'},
-                                                      'ProviderId': {'type': 'string'},
-                                                      'ProviderSpaceId': {'type': 'string'},
-                                                      'ProviderSubnetId': {'type': 'string'},
-                                                      'ProviderVLANId': {'type': 'string'},
-                                                      'VLANTag': {'type': 'integer'}},
-                                       'required': ['DeviceIndex',
-                                                    'MACAddress',
-                                                    'CIDR',
-                                                    'MTU',
-                                                    'ProviderId',
-                                                    'ProviderSubnetId',
-                                                    'ProviderSpaceId',
-                                                    'ProviderAddressId',
-                                                    'ProviderVLANId',
-                                                    'VLANTag',
-                                                    'InterfaceName',
-                                                    'ParentInterfaceName',
-                                                    'InterfaceType',
-                                                    'Disabled'],
+                                       'properties': {'address': {'type': 'string'},
+                                                      'cidr': {'type': 'string'},
+                                                      'config-type': {'type': 'string'},
+                                                      'device-index': {'type': 'integer'},
+                                                      'disabled': {'type': 'boolean'},
+                                                      'dns-search-domains': {'items': {'type': 'string'},
+                                                                             'type': 'array'},
+                                                      'dns-servers': {'items': {'type': 'string'},
+                                                                      'type': 'array'},
+                                                      'gateway-address': {'type': 'string'},
+                                                      'interface-name': {'type': 'string'},
+                                                      'interface-type': {'type': 'string'},
+                                                      'mac-address': {'type': 'string'},
+                                                      'mtu': {'type': 'integer'},
+                                                      'no-auto-start': {'type': 'boolean'},
+                                                      'parent-interface-name': {'type': 'string'},
+                                                      'provider-address-id': {'type': 'string'},
+                                                      'provider-id': {'type': 'string'},
+                                                      'provider-space-id': {'type': 'string'},
+                                                      'provider-subnet-id': {'type': 'string'},
+                                                      'provider-vlan-id': {'type': 'string'},
+                                                      'vlan-tag': {'type': 'integer'}},
+                                       'required': ['device-index',
+                                                    'mac-address',
+                                                    'cidr',
+                                                    'mtu',
+                                                    'provider-id',
+                                                    'provider-subnet-id',
+                                                    'provider-space-id',
+                                                    'provider-address-id',
+                                                    'provider-vlan-id',
+                                                    'vlan-tag',
+                                                    'interface-name',
+                                                    'parent-interface-name',
+                                                    'interface-type',
+                                                    'disabled'],
                                        'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
                      'NotifyWatchResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
+                                            'required': ['results'],
                                             'type': 'object'},
                      'PortRange': {'additionalProperties': False,
-                                   'properties': {'FromPort': {'type': 'integer'},
-                                                  'Protocol': {'type': 'string'},
-                                                  'ToPort': {'type': 'integer'}},
-                                   'required': ['FromPort', 'ToPort', 'Protocol'],
+                                   'properties': {'from-port': {'type': 'integer'},
+                                                  'protocol': {'type': 'string'},
+                                                  'to-port': {'type': 'integer'}},
+                                   'required': ['from-port', 'to-port', 'protocol'],
                                    'type': 'object'},
-                     'Relation': {'additionalProperties': False,
-                                  'properties': {'Interface': {'type': 'string'},
-                                                 'Limit': {'type': 'integer'},
-                                                 'Name': {'type': 'string'},
-                                                 'Optional': {'type': 'boolean'},
-                                                 'Role': {'type': 'string'},
-                                                 'Scope': {'type': 'string'}},
-                                  'required': ['Name',
-                                               'Role',
-                                               'Interface',
-                                               'Optional',
-                                               'Limit',
-                                               'Scope'],
-                                  'type': 'object'},
                      'RelationIds': {'additionalProperties': False,
-                                     'properties': {'RelationIds': {'items': {'type': 'integer'},
-                                                                    'type': 'array'}},
-                                     'required': ['RelationIds'],
+                                     'properties': {'relation-ids': {'items': {'type': 'integer'},
+                                                                     'type': 'array'}},
+                                     'required': ['relation-ids'],
                                      'type': 'object'},
                      'RelationResult': {'additionalProperties': False,
-                                        'properties': {'Endpoint': {'$ref': '#/definitions/Endpoint'},
-                                                       'Error': {'$ref': '#/definitions/Error'},
-                                                       'Id': {'type': 'integer'},
-                                                       'Key': {'type': 'string'},
-                                                       'Life': {'type': 'string'}},
-                                        'required': ['Error',
-                                                     'Life',
-                                                     'Id',
-                                                     'Key',
-                                                     'Endpoint'],
+                                        'properties': {'endpoint': {'$ref': '#/definitions/Endpoint'},
+                                                       'error': {'$ref': '#/definitions/Error'},
+                                                       'id': {'type': 'integer'},
+                                                       'key': {'type': 'string'},
+                                                       'life': {'type': 'string'}},
+                                        'required': ['life',
+                                                     'id',
+                                                     'key',
+                                                     'endpoint'],
                                         'type': 'object'},
                      'RelationResults': {'additionalProperties': False,
-                                         'properties': {'Results': {'items': {'$ref': '#/definitions/RelationResult'},
+                                         'properties': {'results': {'items': {'$ref': '#/definitions/RelationResult'},
                                                                     'type': 'array'}},
-                                         'required': ['Results'],
+                                         'required': ['results'],
                                          'type': 'object'},
                      'RelationUnit': {'additionalProperties': False,
-                                      'properties': {'Relation': {'type': 'string'},
-                                                     'Unit': {'type': 'string'}},
-                                      'required': ['Relation', 'Unit'],
+                                      'properties': {'relation': {'type': 'string'},
+                                                     'unit': {'type': 'string'}},
+                                      'required': ['relation', 'unit'],
                                       'type': 'object'},
                      'RelationUnitPair': {'additionalProperties': False,
-                                          'properties': {'LocalUnit': {'type': 'string'},
-                                                         'Relation': {'type': 'string'},
-                                                         'RemoteUnit': {'type': 'string'}},
-                                          'required': ['Relation',
-                                                       'LocalUnit',
-                                                       'RemoteUnit'],
+                                          'properties': {'local-unit': {'type': 'string'},
+                                                         'relation': {'type': 'string'},
+                                                         'remote-unit': {'type': 'string'}},
+                                          'required': ['relation',
+                                                       'local-unit',
+                                                       'remote-unit'],
                                           'type': 'object'},
                      'RelationUnitPairs': {'additionalProperties': False,
-                                           'properties': {'RelationUnitPairs': {'items': {'$ref': '#/definitions/RelationUnitPair'},
-                                                                                'type': 'array'}},
-                                           'required': ['RelationUnitPairs'],
+                                           'properties': {'relation-unit-pairs': {'items': {'$ref': '#/definitions/RelationUnitPair'},
+                                                                                  'type': 'array'}},
+                                           'required': ['relation-unit-pairs'],
                                            'type': 'object'},
                      'RelationUnitSettings': {'additionalProperties': False,
-                                              'properties': {'Relation': {'type': 'string'},
-                                                             'Settings': {'patternProperties': {'.*': {'type': 'string'}},
+                                              'properties': {'relation': {'type': 'string'},
+                                                             'settings': {'patternProperties': {'.*': {'type': 'string'}},
                                                                           'type': 'object'},
-                                                             'Unit': {'type': 'string'}},
-                                              'required': ['Relation',
-                                                           'Unit',
-                                                           'Settings'],
+                                                             'unit': {'type': 'string'}},
+                                              'required': ['relation',
+                                                           'unit',
+                                                           'settings'],
                                               'type': 'object'},
                      'RelationUnits': {'additionalProperties': False,
-                                       'properties': {'RelationUnits': {'items': {'$ref': '#/definitions/RelationUnit'},
-                                                                        'type': 'array'}},
-                                       'required': ['RelationUnits'],
+                                       'properties': {'relation-units': {'items': {'$ref': '#/definitions/RelationUnit'},
+                                                                         'type': 'array'}},
+                                       'required': ['relation-units'],
                                        'type': 'object'},
                      'RelationUnitsChange': {'additionalProperties': False,
-                                             'properties': {'Changed': {'patternProperties': {'.*': {'$ref': '#/definitions/UnitSettings'}},
+                                             'properties': {'changed': {'patternProperties': {'.*': {'$ref': '#/definitions/UnitSettings'}},
                                                                         'type': 'object'},
-                                                            'Departed': {'items': {'type': 'string'},
+                                                            'departed': {'items': {'type': 'string'},
                                                                          'type': 'array'}},
-                                             'required': ['Changed', 'Departed'],
+                                             'required': ['changed'],
                                              'type': 'object'},
                      'RelationUnitsSettings': {'additionalProperties': False,
-                                               'properties': {'RelationUnits': {'items': {'$ref': '#/definitions/RelationUnitSettings'},
-                                                                                'type': 'array'}},
-                                               'required': ['RelationUnits'],
+                                               'properties': {'relation-units': {'items': {'$ref': '#/definitions/RelationUnitSettings'},
+                                                                                 'type': 'array'}},
+                                               'required': ['relation-units'],
                                                'type': 'object'},
                      'RelationUnitsWatchResult': {'additionalProperties': False,
-                                                  'properties': {'Changes': {'$ref': '#/definitions/RelationUnitsChange'},
-                                                                 'Error': {'$ref': '#/definitions/Error'},
-                                                                 'RelationUnitsWatcherId': {'type': 'string'}},
-                                                  'required': ['RelationUnitsWatcherId',
-                                                               'Changes',
-                                                               'Error'],
+                                                  'properties': {'changes': {'$ref': '#/definitions/RelationUnitsChange'},
+                                                                 'error': {'$ref': '#/definitions/Error'},
+                                                                 'watcher-id': {'type': 'string'}},
+                                                  'required': ['watcher-id',
+                                                               'changes'],
                                                   'type': 'object'},
                      'RelationUnitsWatchResults': {'additionalProperties': False,
-                                                   'properties': {'Results': {'items': {'$ref': '#/definitions/RelationUnitsWatchResult'},
+                                                   'properties': {'results': {'items': {'$ref': '#/definitions/RelationUnitsWatchResult'},
                                                                               'type': 'array'}},
-                                                   'required': ['Results'],
+                                                   'required': ['results'],
                                                    'type': 'object'},
                      'ResolvedModeResult': {'additionalProperties': False,
-                                            'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                           'Mode': {'type': 'string'}},
-                                            'required': ['Error', 'Mode'],
+                                            'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                           'mode': {'type': 'string'}},
+                                            'required': ['mode'],
                                             'type': 'object'},
                      'ResolvedModeResults': {'additionalProperties': False,
-                                             'properties': {'Results': {'items': {'$ref': '#/definitions/ResolvedModeResult'},
+                                             'properties': {'results': {'items': {'$ref': '#/definitions/ResolvedModeResult'},
                                                                         'type': 'array'}},
-                                             'required': ['Results'],
+                                             'required': ['results'],
                                              'type': 'object'},
                      'SetStatus': {'additionalProperties': False,
-                                   'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'},
+                                   'properties': {'entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'},
                                                                'type': 'array'}},
-                                   'required': ['Entities'],
+                                   'required': ['entities'],
                                    'type': 'object'},
                      'SettingsResult': {'additionalProperties': False,
-                                        'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                       'Settings': {'patternProperties': {'.*': {'type': 'string'}},
+                                        'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                       'settings': {'patternProperties': {'.*': {'type': 'string'}},
                                                                     'type': 'object'}},
-                                        'required': ['Error', 'Settings'],
+                                        'required': ['settings'],
                                         'type': 'object'},
                      'SettingsResults': {'additionalProperties': False,
-                                         'properties': {'Results': {'items': {'$ref': '#/definitions/SettingsResult'},
+                                         'properties': {'results': {'items': {'$ref': '#/definitions/SettingsResult'},
                                                                     'type': 'array'}},
-                                         'required': ['Results'],
+                                         'required': ['results'],
                                          'type': 'object'},
                      'StatusResult': {'additionalProperties': False,
-                                      'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True,
+                                      'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True,
                                                                                            'type': 'object'}},
                                                               'type': 'object'},
-                                                     'Error': {'$ref': '#/definitions/Error'},
-                                                     'Id': {'type': 'string'},
-                                                     'Info': {'type': 'string'},
-                                                     'Life': {'type': 'string'},
-                                                     'Since': {'format': 'date-time',
+                                                     'error': {'$ref': '#/definitions/Error'},
+                                                     'id': {'type': 'string'},
+                                                     'info': {'type': 'string'},
+                                                     'life': {'type': 'string'},
+                                                     'since': {'format': 'date-time',
                                                                'type': 'string'},
-                                                     'Status': {'type': 'string'}},
-                                      'required': ['Error',
-                                                   'Id',
-                                                   'Life',
-                                                   'Status',
-                                                   'Info',
-                                                   'Data',
-                                                   'Since'],
+                                                     'status': {'type': 'string'}},
+                                      'required': ['id',
+                                                   'life',
+                                                   'status',
+                                                   'info',
+                                                   'data',
+                                                   'since'],
                                       'type': 'object'},
                      'StatusResults': {'additionalProperties': False,
-                                       'properties': {'Results': {'items': {'$ref': '#/definitions/StatusResult'},
+                                       'properties': {'results': {'items': {'$ref': '#/definitions/StatusResult'},
                                                                   'type': 'array'}},
-                                       'required': ['Results'],
+                                       'required': ['results'],
                                        'type': 'object'},
                      'StorageAddParams': {'additionalProperties': False,
-                                          'properties': {'StorageName': {'type': 'string'},
+                                          'properties': {'name': {'type': 'string'},
                                                          'storage': {'$ref': '#/definitions/StorageConstraints'},
                                                          'unit': {'type': 'string'}},
-                                          'required': ['unit',
-                                                       'StorageName',
-                                                       'storage'],
+                                          'required': ['unit', 'name', 'storage'],
                                           'type': 'object'},
                      'StorageAttachment': {'additionalProperties': False,
-                                           'properties': {'Kind': {'type': 'integer'},
-                                                          'Life': {'type': 'string'},
-                                                          'Location': {'type': 'string'},
-                                                          'OwnerTag': {'type': 'string'},
-                                                          'StorageTag': {'type': 'string'},
-                                                          'UnitTag': {'type': 'string'}},
-                                           'required': ['StorageTag',
-                                                        'OwnerTag',
-                                                        'UnitTag',
-                                                        'Kind',
-                                                        'Location',
-                                                        'Life'],
+                                           'properties': {'kind': {'type': 'integer'},
+                                                          'life': {'type': 'string'},
+                                                          'location': {'type': 'string'},
+                                                          'owner-tag': {'type': 'string'},
+                                                          'storage-tag': {'type': 'string'},
+                                                          'unit-tag': {'type': 'string'}},
+                                           'required': ['storage-tag',
+                                                        'owner-tag',
+                                                        'unit-tag',
+                                                        'kind',
+                                                        'location',
+                                                        'life'],
                                            'type': 'object'},
                      'StorageAttachmentId': {'additionalProperties': False,
-                                             'properties': {'storagetag': {'type': 'string'},
-                                                            'unittag': {'type': 'string'}},
-                                             'required': ['storagetag', 'unittag'],
+                                             'properties': {'storage-tag': {'type': 'string'},
+                                                            'unit-tag': {'type': 'string'}},
+                                             'required': ['storage-tag',
+                                                          'unit-tag'],
                                              'type': 'object'},
                      'StorageAttachmentIds': {'additionalProperties': False,
                                               'properties': {'ids': {'items': {'$ref': '#/definitions/StorageAttachmentId'},
@@ -18538,10 +19532,9 @@ class UniterFacade(Type):
                                                                              'type': 'array'}},
                                                   'type': 'object'},
                      'StorageConstraints': {'additionalProperties': False,
-                                            'properties': {'Count': {'type': 'integer'},
-                                                           'Pool': {'type': 'string'},
-                                                           'Size': {'type': 'integer'}},
-                                            'required': ['Pool', 'Size', 'Count'],
+                                            'properties': {'count': {'type': 'integer'},
+                                                           'pool': {'type': 'string'},
+                                                           'size': {'type': 'integer'}},
                                             'type': 'object'},
                      'StoragesAddParams': {'additionalProperties': False,
                                            'properties': {'storages': {'items': {'$ref': '#/definitions/StorageAddParams'},
@@ -18549,90 +19542,73 @@ class UniterFacade(Type):
                                            'required': ['storages'],
                                            'type': 'object'},
                      'StringBoolResult': {'additionalProperties': False,
-                                          'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                         'Ok': {'type': 'boolean'},
-                                                         'Result': {'type': 'string'}},
-                                          'required': ['Error', 'Result', 'Ok'],
+                                          'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                         'ok': {'type': 'boolean'},
+                                                         'result': {'type': 'string'}},
+                                          'required': ['result', 'ok'],
                                           'type': 'object'},
                      'StringBoolResults': {'additionalProperties': False,
-                                           'properties': {'Results': {'items': {'$ref': '#/definitions/StringBoolResult'},
+                                           'properties': {'results': {'items': {'$ref': '#/definitions/StringBoolResult'},
                                                                       'type': 'array'}},
-                                           'required': ['Results'],
+                                           'required': ['results'],
                                            'type': 'object'},
                      'StringResult': {'additionalProperties': False,
-                                      'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                     'Result': {'type': 'string'}},
-                                      'required': ['Error', 'Result'],
+                                      'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                     'result': {'type': 'string'}},
+                                      'required': ['result'],
                                       'type': 'object'},
                      'StringResults': {'additionalProperties': False,
-                                       'properties': {'Results': {'items': {'$ref': '#/definitions/StringResult'},
+                                       'properties': {'results': {'items': {'$ref': '#/definitions/StringResult'},
                                                                   'type': 'array'}},
-                                       'required': ['Results'],
+                                       'required': ['results'],
                                        'type': 'object'},
                      'StringsResult': {'additionalProperties': False,
-                                       'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                      'Result': {'items': {'type': 'string'},
+                                       'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                      'result': {'items': {'type': 'string'},
                                                                  'type': 'array'}},
-                                       'required': ['Error', 'Result'],
                                        'type': 'object'},
                      'StringsResults': {'additionalProperties': False,
-                                        'properties': {'Results': {'items': {'$ref': '#/definitions/StringsResult'},
+                                        'properties': {'results': {'items': {'$ref': '#/definitions/StringsResult'},
                                                                    'type': 'array'}},
-                                        'required': ['Results'],
+                                        'required': ['results'],
                                         'type': 'object'},
                      'StringsWatchResult': {'additionalProperties': False,
-                                            'properties': {'Changes': {'items': {'type': 'string'},
+                                            'properties': {'changes': {'items': {'type': 'string'},
                                                                        'type': 'array'},
-                                                           'Error': {'$ref': '#/definitions/Error'},
-                                                           'StringsWatcherId': {'type': 'string'}},
-                                            'required': ['StringsWatcherId',
-                                                         'Changes',
-                                                         'Error'],
+                                                           'error': {'$ref': '#/definitions/Error'},
+                                                           'watcher-id': {'type': 'string'}},
+                                            'required': ['watcher-id'],
                                             'type': 'object'},
                      'StringsWatchResults': {'additionalProperties': False,
-                                             'properties': {'Results': {'items': {'$ref': '#/definitions/StringsWatchResult'},
+                                             'properties': {'results': {'items': {'$ref': '#/definitions/StringsWatchResult'},
                                                                         'type': 'array'}},
-                                             'required': ['Results'],
+                                             'required': ['results'],
                                              'type': 'object'},
                      'UnitNetworkConfig': {'additionalProperties': False,
-                                           'properties': {'BindingName': {'type': 'string'},
-                                                          'UnitTag': {'type': 'string'}},
-                                           'required': ['UnitTag', 'BindingName'],
+                                           'properties': {'binding-name': {'type': 'string'},
+                                                          'unit-tag': {'type': 'string'}},
+                                           'required': ['unit-tag', 'binding-name'],
                                            'type': 'object'},
                      'UnitNetworkConfigResult': {'additionalProperties': False,
-                                                 'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                                'Info': {'items': {'$ref': '#/definitions/NetworkConfig'},
+                                                 'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                                'info': {'items': {'$ref': '#/definitions/NetworkConfig'},
                                                                          'type': 'array'}},
-                                                 'required': ['Error', 'Info'],
+                                                 'required': ['info'],
                                                  'type': 'object'},
                      'UnitNetworkConfigResults': {'additionalProperties': False,
-                                                  'properties': {'Results': {'items': {'$ref': '#/definitions/UnitNetworkConfigResult'},
+                                                  'properties': {'results': {'items': {'$ref': '#/definitions/UnitNetworkConfigResult'},
                                                                              'type': 'array'}},
-                                                  'required': ['Results'],
+                                                  'required': ['results'],
                                                   'type': 'object'},
                      'UnitSettings': {'additionalProperties': False,
-                                      'properties': {'Version': {'type': 'integer'}},
-                                      'required': ['Version'],
+                                      'properties': {'version': {'type': 'integer'}},
+                                      'required': ['version'],
                                       'type': 'object'},
                      'UnitsNetworkConfig': {'additionalProperties': False,
-                                            'properties': {'Args': {'items': {'$ref': '#/definitions/UnitNetworkConfig'},
+                                            'properties': {'args': {'items': {'$ref': '#/definitions/UnitNetworkConfig'},
                                                                     'type': 'array'}},
-                                            'required': ['Args'],
-                                            'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                            'required': ['args'],
+                                            'type': 'object'}},
      'properties': {'APIAddresses': {'properties': {'Result': {'$ref': '#/definitions/StringsResult'}},
                                      'type': 'object'},
                     'APIHostPorts': {'properties': {'Result': {'$ref': '#/definitions/APIHostPortsResult'}},
@@ -18649,9 +19625,6 @@ class UniterFacade(Type):
                     'AllMachinePorts': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                        'Result': {'$ref': '#/definitions/MachinePortsResults'}},
                                         'type': 'object'},
-                    'ApplicationOwner': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
-                                                        'Result': {'$ref': '#/definitions/StringResults'}},
-                                         'type': 'object'},
                     'ApplicationStatus': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                          'Result': {'$ref': '#/definitions/ApplicationStatusResults'}},
                                           'type': 'object'},
@@ -18782,6 +19755,9 @@ class UniterFacade(Type):
                     'SetUnitStatus': {'properties': {'Params': {'$ref': '#/definitions/SetStatus'},
                                                      'Result': {'$ref': '#/definitions/ErrorResults'}},
                                       'type': 'object'},
+                    'SetWorkloadVersion': {'properties': {'Params': {'$ref': '#/definitions/EntityWorkloadVersions'},
+                                                          'Result': {'$ref': '#/definitions/ErrorResults'}},
+                                           'type': 'object'},
                     'StorageAttachmentLife': {'properties': {'Params': {'$ref': '#/definitions/StorageAttachmentIds'},
                                                              'Result': {'$ref': '#/definitions/LifeResults'}},
                                               'type': 'object'},
@@ -18830,7 +19806,10 @@ class UniterFacade(Type):
                                            'type': 'object'},
                     'WatchUnitStorageAttachments': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                                    'Result': {'$ref': '#/definitions/StringsWatchResults'}},
-                                                    'type': 'object'}},
+                                                    'type': 'object'},
+                    'WorkloadVersion': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                       'Result': {'$ref': '#/definitions/StringResults'}},
+                                        'type': 'object'}},
      'type': 'object'}
     
 
@@ -18838,11 +19817,11 @@ class UniterFacade(Type):
     async def APIAddresses(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence[str]]
+        Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence<+T_co>[str]]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='APIAddresses', Version=4, Params=params)
+        _params = dict()
+        msg = dict(type='Uniter', request='APIAddresses', version=4, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -18853,11 +19832,11 @@ class UniterFacade(Type):
     async def APIHostPorts(self):
         '''
 
-        Returns -> typing.Sequence[~HostPort]
+        Returns -> typing.Sequence<+T_co>[~HostPort]<~HostPort>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='APIHostPorts', Version=4, Params=params)
+        _params = dict()
+        msg = dict(type='Uniter', request='APIHostPorts', version=4, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -18867,13 +19846,13 @@ class UniterFacade(Type):
     @ReturnMapping(ActionResults)
     async def Actions(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ActionResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ActionResult]<~ActionResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='Actions', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='Actions', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -18882,13 +19861,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def AddMetricBatches(self, batches):
         '''
-        batches : typing.Sequence[~MetricBatchParam]
-        Returns -> typing.Sequence[~ErrorResult]
+        batches : typing.Sequence<+T_co>[~MetricBatchParam]<~MetricBatchParam>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='AddMetricBatches', Version=4, Params=params)
-        params['Batches'] = batches
+        _params = dict()
+        msg = dict(type='Uniter', request='AddMetricBatches', version=4, params=_params)
+        _params['batches'] = batches
         reply = await self.rpc(msg)
         return reply
 
@@ -18897,13 +19876,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def AddUnitStorage(self, storages):
         '''
-        storages : typing.Sequence[~StorageAddParams]
-        Returns -> typing.Sequence[~ErrorResult]
+        storages : typing.Sequence<+T_co>[~StorageAddParams]<~StorageAddParams>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='AddUnitStorage', Version=4, Params=params)
-        params['storages'] = storages
+        _params = dict()
+        msg = dict(type='Uniter', request='AddUnitStorage', version=4, params=_params)
+        _params['storages'] = storages
         reply = await self.rpc(msg)
         return reply
 
@@ -18912,28 +19891,13 @@ class UniterFacade(Type):
     @ReturnMapping(MachinePortsResults)
     async def AllMachinePorts(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~MachinePortsResult]
-        '''
-        # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='AllMachinePorts', Version=4, Params=params)
-        params['Entities'] = entities
-        reply = await self.rpc(msg)
-        return reply
-
-
-
-    @ReturnMapping(StringResults)
-    async def ApplicationOwner(self, entities):
-        '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~MachinePortsResult]<~MachinePortsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='ApplicationOwner', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='AllMachinePorts', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -18942,13 +19906,13 @@ class UniterFacade(Type):
     @ReturnMapping(ApplicationStatusResults)
     async def ApplicationStatus(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ApplicationStatusResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ApplicationStatusResult]<~ApplicationStatusResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='ApplicationStatus', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='ApplicationStatus', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -18957,13 +19921,13 @@ class UniterFacade(Type):
     @ReturnMapping(StringResults)
     async def AssignedMachine(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringResult]<~StringResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='AssignedMachine', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='AssignedMachine', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -18972,13 +19936,13 @@ class UniterFacade(Type):
     @ReturnMapping(StringResults)
     async def AvailabilityZone(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringResult]<~StringResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='AvailabilityZone', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='AvailabilityZone', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -18987,13 +19951,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def BeginActions(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='BeginActions', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='BeginActions', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19003,11 +19967,11 @@ class UniterFacade(Type):
     async def CACert(self):
         '''
 
-        Returns -> typing.Sequence[int]
+        Returns -> typing.Sequence<+T_co>[int]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='CACert', Version=4, Params=params)
+        _params = dict()
+        msg = dict(type='Uniter', request='CACert', version=4, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -19017,13 +19981,13 @@ class UniterFacade(Type):
     @ReturnMapping(StringResults)
     async def CharmArchiveSha256(self, urls):
         '''
-        urls : typing.Sequence[~CharmURL]
-        Returns -> typing.Sequence[~StringResult]
+        urls : typing.Sequence<+T_co>[~CharmURL]<~CharmURL>
+        Returns -> typing.Sequence<+T_co>[~StringResult]<~StringResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='CharmArchiveSha256', Version=4, Params=params)
-        params['URLs'] = urls
+        _params = dict()
+        msg = dict(type='Uniter', request='CharmArchiveSha256', version=4, params=_params)
+        _params['urls'] = urls
         reply = await self.rpc(msg)
         return reply
 
@@ -19032,13 +19996,13 @@ class UniterFacade(Type):
     @ReturnMapping(IntResults)
     async def CharmModifiedVersion(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~IntResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~IntResult]<~IntResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='CharmModifiedVersion', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='CharmModifiedVersion', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19047,13 +20011,13 @@ class UniterFacade(Type):
     @ReturnMapping(StringBoolResults)
     async def CharmURL(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringBoolResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringBoolResult]<~StringBoolResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='CharmURL', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='CharmURL', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19062,13 +20026,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def ClearResolved(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='ClearResolved', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='ClearResolved', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19077,13 +20041,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def ClosePorts(self, entities):
         '''
-        entities : typing.Sequence[~EntityPortRange]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityPortRange]<~EntityPortRange>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='ClosePorts', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='ClosePorts', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19092,13 +20056,13 @@ class UniterFacade(Type):
     @ReturnMapping(ConfigSettingsResults)
     async def ConfigSettings(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ConfigSettingsResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ConfigSettingsResult]<~ConfigSettingsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='ConfigSettings', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='ConfigSettings', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19111,8 +20075,8 @@ class UniterFacade(Type):
         Returns -> typing.Union[_ForwardRef('Error'), str]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='CurrentModel', Version=4, Params=params)
+        _params = dict()
+        msg = dict(type='Uniter', request='CurrentModel', version=4, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -19122,13 +20086,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def Destroy(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='Destroy', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='Destroy', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19137,13 +20101,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def DestroyAllSubordinates(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='DestroyAllSubordinates', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='DestroyAllSubordinates', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19152,13 +20116,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def DestroyUnitStorageAttachments(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='DestroyUnitStorageAttachments', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='DestroyUnitStorageAttachments', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19167,28 +20131,28 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def EnsureDead(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='EnsureDead', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='EnsureDead', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(ErrorResults)
-    async def EnterScope(self, relationunits):
+    async def EnterScope(self, relation_units):
         '''
-        relationunits : typing.Sequence[~RelationUnit]
-        Returns -> typing.Sequence[~ErrorResult]
+        relation_units : typing.Sequence<+T_co>[~RelationUnit]<~RelationUnit>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='EnterScope', Version=4, Params=params)
-        params['RelationUnits'] = relationunits
+        _params = dict()
+        msg = dict(type='Uniter', request='EnterScope', version=4, params=_params)
+        _params['relation-units'] = relation_units
         reply = await self.rpc(msg)
         return reply
 
@@ -19197,13 +20161,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def FinishActions(self, results):
         '''
-        results : typing.Sequence[~ActionExecutionResult]
-        Returns -> typing.Sequence[~ErrorResult]
+        results : typing.Sequence<+T_co>[~ActionExecutionResult]<~ActionExecutionResult>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='FinishActions', Version=4, Params=params)
-        params['results'] = results
+        _params = dict()
+        msg = dict(type='Uniter', request='FinishActions', version=4, params=_params)
+        _params['results'] = results
         reply = await self.rpc(msg)
         return reply
 
@@ -19212,13 +20176,13 @@ class UniterFacade(Type):
     @ReturnMapping(MeterStatusResults)
     async def GetMeterStatus(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~MeterStatusResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~MeterStatusResult]<~MeterStatusResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='GetMeterStatus', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='GetMeterStatus', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19227,13 +20191,13 @@ class UniterFacade(Type):
     @ReturnMapping(StringBoolResults)
     async def GetPrincipal(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringBoolResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringBoolResult]<~StringBoolResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='GetPrincipal', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='GetPrincipal', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19242,13 +20206,13 @@ class UniterFacade(Type):
     @ReturnMapping(BoolResults)
     async def HasSubordinates(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~BoolResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~BoolResult]<~BoolResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='HasSubordinates', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='HasSubordinates', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19257,28 +20221,28 @@ class UniterFacade(Type):
     @ReturnMapping(StringsResults)
     async def JoinedRelations(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringsResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringsResult]<~StringsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='JoinedRelations', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='JoinedRelations', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(ErrorResults)
-    async def LeaveScope(self, relationunits):
+    async def LeaveScope(self, relation_units):
         '''
-        relationunits : typing.Sequence[~RelationUnit]
-        Returns -> typing.Sequence[~ErrorResult]
+        relation_units : typing.Sequence<+T_co>[~RelationUnit]<~RelationUnit>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='LeaveScope', Version=4, Params=params)
-        params['RelationUnits'] = relationunits
+        _params = dict()
+        msg = dict(type='Uniter', request='LeaveScope', version=4, params=_params)
+        _params['relation-units'] = relation_units
         reply = await self.rpc(msg)
         return reply
 
@@ -19287,13 +20251,13 @@ class UniterFacade(Type):
     @ReturnMapping(LifeResults)
     async def Life(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~LifeResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~LifeResult]<~LifeResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='Life', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='Life', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19302,13 +20266,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def Merge(self, params):
         '''
-        params : typing.Sequence[~MergeLeadershipSettingsParam]
-        Returns -> typing.Sequence[~ErrorResult]
+        params : typing.Sequence<+T_co>[~MergeLeadershipSettingsParam]<~MergeLeadershipSettingsParam>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='Merge', Version=4, Params=params)
-        params['Params'] = params
+        _params = dict()
+        msg = dict(type='Uniter', request='Merge', version=4, params=_params)
+        _params['params'] = params
         reply = await self.rpc(msg)
         return reply
 
@@ -19318,11 +20282,11 @@ class UniterFacade(Type):
     async def ModelConfig(self):
         '''
 
-        Returns -> typing.Mapping[str, typing.Any]
+        Returns -> typing.Mapping<~KT, +VT_co>[str, typing.Any]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='ModelConfig', Version=4, Params=params)
+        _params = dict()
+        msg = dict(type='Uniter', request='ModelConfig', version=4, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -19336,8 +20300,8 @@ class UniterFacade(Type):
         Returns -> typing.Union[_ForwardRef('Error'), str]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='ModelUUID', Version=4, Params=params)
+        _params = dict()
+        msg = dict(type='Uniter', request='ModelUUID', version=4, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -19347,13 +20311,13 @@ class UniterFacade(Type):
     @ReturnMapping(UnitNetworkConfigResults)
     async def NetworkConfig(self, args):
         '''
-        args : typing.Sequence[~UnitNetworkConfig]
-        Returns -> typing.Sequence[~UnitNetworkConfigResult]
+        args : typing.Sequence<+T_co>[~UnitNetworkConfig]<~UnitNetworkConfig>
+        Returns -> typing.Sequence<+T_co>[~UnitNetworkConfigResult]<~UnitNetworkConfigResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='NetworkConfig', Version=4, Params=params)
-        params['Args'] = args
+        _params = dict()
+        msg = dict(type='Uniter', request='NetworkConfig', version=4, params=_params)
+        _params['args'] = args
         reply = await self.rpc(msg)
         return reply
 
@@ -19362,13 +20326,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def OpenPorts(self, entities):
         '''
-        entities : typing.Sequence[~EntityPortRange]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityPortRange]<~EntityPortRange>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='OpenPorts', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='OpenPorts', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19377,13 +20341,13 @@ class UniterFacade(Type):
     @ReturnMapping(StringResults)
     async def PrivateAddress(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringResult]<~StringResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='PrivateAddress', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='PrivateAddress', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19396,8 +20360,8 @@ class UniterFacade(Type):
         Returns -> typing.Union[_ForwardRef('Error'), str]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='ProviderType', Version=4, Params=params)
+        _params = dict()
+        msg = dict(type='Uniter', request='ProviderType', version=4, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -19407,13 +20371,13 @@ class UniterFacade(Type):
     @ReturnMapping(StringResults)
     async def PublicAddress(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringResult]<~StringResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='PublicAddress', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='PublicAddress', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19422,73 +20386,73 @@ class UniterFacade(Type):
     @ReturnMapping(GetLeadershipSettingsBulkResults)
     async def Read(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~GetLeadershipSettingsResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~GetLeadershipSettingsResult]<~GetLeadershipSettingsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='Read', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='Read', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(SettingsResults)
-    async def ReadRemoteSettings(self, relationunitpairs):
+    async def ReadRemoteSettings(self, relation_unit_pairs):
         '''
-        relationunitpairs : typing.Sequence[~RelationUnitPair]
-        Returns -> typing.Sequence[~SettingsResult]
+        relation_unit_pairs : typing.Sequence<+T_co>[~RelationUnitPair]<~RelationUnitPair>
+        Returns -> typing.Sequence<+T_co>[~SettingsResult]<~SettingsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='ReadRemoteSettings', Version=4, Params=params)
-        params['RelationUnitPairs'] = relationunitpairs
+        _params = dict()
+        msg = dict(type='Uniter', request='ReadRemoteSettings', version=4, params=_params)
+        _params['relation-unit-pairs'] = relation_unit_pairs
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(SettingsResults)
-    async def ReadSettings(self, relationunits):
+    async def ReadSettings(self, relation_units):
         '''
-        relationunits : typing.Sequence[~RelationUnit]
-        Returns -> typing.Sequence[~SettingsResult]
+        relation_units : typing.Sequence<+T_co>[~RelationUnit]<~RelationUnit>
+        Returns -> typing.Sequence<+T_co>[~SettingsResult]<~SettingsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='ReadSettings', Version=4, Params=params)
-        params['RelationUnits'] = relationunits
+        _params = dict()
+        msg = dict(type='Uniter', request='ReadSettings', version=4, params=_params)
+        _params['relation-units'] = relation_units
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(RelationResults)
-    async def Relation(self, relationunits):
+    async def Relation(self, relation_units):
         '''
-        relationunits : typing.Sequence[~RelationUnit]
-        Returns -> typing.Sequence[~RelationResult]
+        relation_units : typing.Sequence<+T_co>[~RelationUnit]<~RelationUnit>
+        Returns -> typing.Sequence<+T_co>[~RelationResult]<~RelationResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='Relation', Version=4, Params=params)
-        params['RelationUnits'] = relationunits
+        _params = dict()
+        msg = dict(type='Uniter', request='Relation', version=4, params=_params)
+        _params['relation-units'] = relation_units
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(RelationResults)
-    async def RelationById(self, relationids):
+    async def RelationById(self, relation_ids):
         '''
-        relationids : typing.Sequence[int]
-        Returns -> typing.Sequence[~RelationResult]
+        relation_ids : typing.Sequence<+T_co>[int]
+        Returns -> typing.Sequence<+T_co>[~RelationResult]<~RelationResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='RelationById', Version=4, Params=params)
-        params['RelationIds'] = relationids
+        _params = dict()
+        msg = dict(type='Uniter', request='RelationById', version=4, params=_params)
+        _params['relation-ids'] = relation_ids
         reply = await self.rpc(msg)
         return reply
 
@@ -19497,13 +20461,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def RemoveStorageAttachments(self, ids):
         '''
-        ids : typing.Sequence[~StorageAttachmentId]
-        Returns -> typing.Sequence[~ErrorResult]
+        ids : typing.Sequence<+T_co>[~StorageAttachmentId]<~StorageAttachmentId>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='RemoveStorageAttachments', Version=4, Params=params)
-        params['ids'] = ids
+        _params = dict()
+        msg = dict(type='Uniter', request='RemoveStorageAttachments', version=4, params=_params)
+        _params['ids'] = ids
         reply = await self.rpc(msg)
         return reply
 
@@ -19512,13 +20476,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def RequestReboot(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='RequestReboot', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='RequestReboot', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19527,13 +20491,13 @@ class UniterFacade(Type):
     @ReturnMapping(ResolvedModeResults)
     async def Resolved(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ResolvedModeResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ResolvedModeResult]<~ResolvedModeResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='Resolved', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='Resolved', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19542,13 +20506,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetAgentStatus(self, entities):
         '''
-        entities : typing.Sequence[~EntityStatusArgs]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='SetAgentStatus', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='SetAgentStatus', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19557,13 +20521,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetApplicationStatus(self, entities):
         '''
-        entities : typing.Sequence[~EntityStatusArgs]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='SetApplicationStatus', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='SetApplicationStatus', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19572,13 +20536,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetCharmURL(self, entities):
         '''
-        entities : typing.Sequence[~EntityCharmURL]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityCharmURL]<~EntityCharmURL>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='SetCharmURL', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='SetCharmURL', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19587,13 +20551,13 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetStatus(self, entities):
         '''
-        entities : typing.Sequence[~EntityStatusArgs]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='SetStatus', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='SetStatus', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19602,13 +20566,28 @@ class UniterFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetUnitStatus(self, entities):
         '''
-        entities : typing.Sequence[~EntityStatusArgs]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~EntityStatusArgs]<~EntityStatusArgs>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Uniter', request='SetUnitStatus', version=4, params=_params)
+        _params['entities'] = entities
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(ErrorResults)
+    async def SetWorkloadVersion(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~EntityWorkloadVersion]<~EntityWorkloadVersion>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='SetUnitStatus', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='SetWorkloadVersion', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19617,13 +20596,13 @@ class UniterFacade(Type):
     @ReturnMapping(LifeResults)
     async def StorageAttachmentLife(self, ids):
         '''
-        ids : typing.Sequence[~StorageAttachmentId]
-        Returns -> typing.Sequence[~LifeResult]
+        ids : typing.Sequence<+T_co>[~StorageAttachmentId]<~StorageAttachmentId>
+        Returns -> typing.Sequence<+T_co>[~LifeResult]<~LifeResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='StorageAttachmentLife', Version=4, Params=params)
-        params['ids'] = ids
+        _params = dict()
+        msg = dict(type='Uniter', request='StorageAttachmentLife', version=4, params=_params)
+        _params['ids'] = ids
         reply = await self.rpc(msg)
         return reply
 
@@ -19632,13 +20611,13 @@ class UniterFacade(Type):
     @ReturnMapping(StorageAttachmentResults)
     async def StorageAttachments(self, ids):
         '''
-        ids : typing.Sequence[~StorageAttachmentId]
-        Returns -> typing.Sequence[~StorageAttachmentResult]
+        ids : typing.Sequence<+T_co>[~StorageAttachmentId]<~StorageAttachmentId>
+        Returns -> typing.Sequence<+T_co>[~StorageAttachmentResult]<~StorageAttachmentResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='StorageAttachments', Version=4, Params=params)
-        params['ids'] = ids
+        _params = dict()
+        msg = dict(type='Uniter', request='StorageAttachments', version=4, params=_params)
+        _params['ids'] = ids
         reply = await self.rpc(msg)
         return reply
 
@@ -19647,13 +20626,13 @@ class UniterFacade(Type):
     @ReturnMapping(StatusResults)
     async def UnitStatus(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StatusResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StatusResult]<~StatusResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='UnitStatus', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='UnitStatus', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19662,28 +20641,28 @@ class UniterFacade(Type):
     @ReturnMapping(StorageAttachmentIdsResults)
     async def UnitStorageAttachments(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StorageAttachmentIdsResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StorageAttachmentIdsResult]<~StorageAttachmentIdsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='UnitStorageAttachments', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='UnitStorageAttachments', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(ErrorResults)
-    async def UpdateSettings(self, relationunits):
+    async def UpdateSettings(self, relation_units):
         '''
-        relationunits : typing.Sequence[~RelationUnitSettings]
-        Returns -> typing.Sequence[~ErrorResult]
+        relation_units : typing.Sequence<+T_co>[~RelationUnitSettings]<~RelationUnitSettings>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='UpdateSettings', Version=4, Params=params)
-        params['RelationUnits'] = relationunits
+        _params = dict()
+        msg = dict(type='Uniter', request='UpdateSettings', version=4, params=_params)
+        _params['relation-units'] = relation_units
         reply = await self.rpc(msg)
         return reply
 
@@ -19692,13 +20671,13 @@ class UniterFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def Watch(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='Watch', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='Watch', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19708,11 +20687,11 @@ class UniterFacade(Type):
     async def WatchAPIHostPorts(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), str]
+        Returns -> typing.Union[str, _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='WatchAPIHostPorts', Version=4, Params=params)
+        _params = dict()
+        msg = dict(type='Uniter', request='WatchAPIHostPorts', version=4, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -19722,13 +20701,13 @@ class UniterFacade(Type):
     @ReturnMapping(StringsWatchResults)
     async def WatchActionNotifications(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringsWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringsWatchResult]<~StringsWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='WatchActionNotifications', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='WatchActionNotifications', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19737,13 +20716,13 @@ class UniterFacade(Type):
     @ReturnMapping(StringsWatchResults)
     async def WatchApplicationRelations(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringsWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringsWatchResult]<~StringsWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='WatchApplicationRelations', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='WatchApplicationRelations', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19752,13 +20731,13 @@ class UniterFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def WatchConfigSettings(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='WatchConfigSettings', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='WatchConfigSettings', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19768,11 +20747,11 @@ class UniterFacade(Type):
     async def WatchForModelConfigChanges(self):
         '''
 
-        Returns -> typing.Union[_ForwardRef('Error'), str]
+        Returns -> typing.Union[str, _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='WatchForModelConfigChanges', Version=4, Params=params)
+        _params = dict()
+        msg = dict(type='Uniter', request='WatchForModelConfigChanges', version=4, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -19782,13 +20761,13 @@ class UniterFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def WatchLeadershipSettings(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='WatchLeadershipSettings', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='WatchLeadershipSettings', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19797,28 +20776,28 @@ class UniterFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def WatchMeterStatus(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='WatchMeterStatus', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='WatchMeterStatus', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(RelationUnitsWatchResults)
-    async def WatchRelationUnits(self, relationunits):
+    async def WatchRelationUnits(self, relation_units):
         '''
-        relationunits : typing.Sequence[~RelationUnit]
-        Returns -> typing.Sequence[~RelationUnitsWatchResult]
+        relation_units : typing.Sequence<+T_co>[~RelationUnit]<~RelationUnit>
+        Returns -> typing.Sequence<+T_co>[~RelationUnitsWatchResult]<~RelationUnitsWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='WatchRelationUnits', Version=4, Params=params)
-        params['RelationUnits'] = relationunits
+        _params = dict()
+        msg = dict(type='Uniter', request='WatchRelationUnits', version=4, params=_params)
+        _params['relation-units'] = relation_units
         reply = await self.rpc(msg)
         return reply
 
@@ -19827,13 +20806,13 @@ class UniterFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def WatchStorageAttachments(self, ids):
         '''
-        ids : typing.Sequence[~StorageAttachmentId]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        ids : typing.Sequence<+T_co>[~StorageAttachmentId]<~StorageAttachmentId>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='WatchStorageAttachments', Version=4, Params=params)
-        params['ids'] = ids
+        _params = dict()
+        msg = dict(type='Uniter', request='WatchStorageAttachments', version=4, params=_params)
+        _params['ids'] = ids
         reply = await self.rpc(msg)
         return reply
 
@@ -19842,13 +20821,13 @@ class UniterFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def WatchUnitAddresses(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='WatchUnitAddresses', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='WatchUnitAddresses', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19857,13 +20836,28 @@ class UniterFacade(Type):
     @ReturnMapping(StringsWatchResults)
     async def WatchUnitStorageAttachments(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~StringsWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringsWatchResult]<~StringsWatchResult>
+        '''
+        # map input types to rpc msg
+        _params = dict()
+        msg = dict(type='Uniter', request='WatchUnitStorageAttachments', version=4, params=_params)
+        _params['entities'] = entities
+        reply = await self.rpc(msg)
+        return reply
+
+
+
+    @ReturnMapping(StringResults)
+    async def WorkloadVersion(self, entities):
+        '''
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~StringResult]<~StringResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Uniter', Request='WatchUnitStorageAttachments', Version=4, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Uniter', request='WorkloadVersion', version=4, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -19878,67 +20872,52 @@ class UpgraderFacade(Type):
                                 'required': ['Number', 'Series', 'Arch'],
                                 'type': 'object'},
                      'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'EntitiesVersion': {'additionalProperties': False,
-                                         'properties': {'AgentTools': {'items': {'$ref': '#/definitions/EntityVersion'},
-                                                                       'type': 'array'}},
-                                         'required': ['AgentTools'],
+                                         'properties': {'agent-tools': {'items': {'$ref': '#/definitions/EntityVersion'},
+                                                                        'type': 'array'}},
+                                         'required': ['agent-tools'],
                                          'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'EntityVersion': {'additionalProperties': False,
-                                       'properties': {'Tag': {'type': 'string'},
-                                                      'Tools': {'$ref': '#/definitions/Version'}},
-                                       'required': ['Tag', 'Tools'],
+                                       'properties': {'tag': {'type': 'string'},
+                                                      'tools': {'$ref': '#/definitions/Version'}},
+                                       'required': ['tag', 'tools'],
                                        'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'NotifyWatchResult': {'additionalProperties': False,
-                                           'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                          'NotifyWatcherId': {'type': 'string'}},
-                                           'required': ['NotifyWatcherId', 'Error'],
+                                           'properties': {'NotifyWatcherId': {'type': 'string'},
+                                                          'error': {'$ref': '#/definitions/Error'}},
+                                           'required': ['NotifyWatcherId'],
                                            'type': 'object'},
                      'NotifyWatchResults': {'additionalProperties': False,
-                                            'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
+                                            'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'},
                                                                        'type': 'array'}},
-                                            'required': ['Results'],
+                                            'required': ['results'],
                                             'type': 'object'},
                      'Number': {'additionalProperties': False,
                                 'properties': {'Build': {'type': 'integer'},
@@ -19960,47 +20939,31 @@ class UpgraderFacade(Type):
                                'required': ['version', 'url', 'size'],
                                'type': 'object'},
                      'ToolsResult': {'additionalProperties': False,
-                                     'properties': {'DisableSSLHostnameVerification': {'type': 'boolean'},
-                                                    'Error': {'$ref': '#/definitions/Error'},
-                                                    'ToolsList': {'items': {'$ref': '#/definitions/Tools'},
-                                                                  'type': 'array'}},
-                                     'required': ['ToolsList',
-                                                  'DisableSSLHostnameVerification',
-                                                  'Error'],
+                                     'properties': {'disable-ssl-hostname-verification': {'type': 'boolean'},
+                                                    'error': {'$ref': '#/definitions/Error'},
+                                                    'tools': {'items': {'$ref': '#/definitions/Tools'},
+                                                              'type': 'array'}},
+                                     'required': ['tools',
+                                                  'disable-ssl-hostname-verification'],
                                      'type': 'object'},
                      'ToolsResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ToolsResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ToolsResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
                      'Version': {'additionalProperties': False,
-                                 'properties': {'Version': {'$ref': '#/definitions/Binary'}},
-                                 'required': ['Version'],
+                                 'properties': {'version': {'$ref': '#/definitions/Binary'}},
+                                 'required': ['version'],
                                  'type': 'object'},
                      'VersionResult': {'additionalProperties': False,
-                                       'properties': {'Error': {'$ref': '#/definitions/Error'},
-                                                      'Version': {'$ref': '#/definitions/Number'}},
-                                       'required': ['Version', 'Error'],
+                                       'properties': {'error': {'$ref': '#/definitions/Error'},
+                                                      'version': {'$ref': '#/definitions/Number'}},
                                        'type': 'object'},
                      'VersionResults': {'additionalProperties': False,
-                                        'properties': {'Results': {'items': {'$ref': '#/definitions/VersionResult'},
+                                        'properties': {'results': {'items': {'$ref': '#/definitions/VersionResult'},
                                                                    'type': 'array'}},
-                                        'required': ['Results'],
-                                        'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                        'required': ['results'],
+                                        'type': 'object'}},
      'properties': {'DesiredVersion': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                       'Result': {'$ref': '#/definitions/VersionResults'}},
                                        'type': 'object'},
@@ -20019,28 +20982,28 @@ class UpgraderFacade(Type):
     @ReturnMapping(VersionResults)
     async def DesiredVersion(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~VersionResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~VersionResult]<~VersionResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Upgrader', Request='DesiredVersion', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Upgrader', request='DesiredVersion', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(ErrorResults)
-    async def SetTools(self, agenttools):
+    async def SetTools(self, agent_tools):
         '''
-        agenttools : typing.Sequence[~EntityVersion]
-        Returns -> typing.Sequence[~ErrorResult]
+        agent_tools : typing.Sequence<+T_co>[~EntityVersion]<~EntityVersion>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Upgrader', Request='SetTools', Version=1, Params=params)
-        params['AgentTools'] = agenttools
+        _params = dict()
+        msg = dict(type='Upgrader', request='SetTools', version=1, params=_params)
+        _params['agent-tools'] = agent_tools
         reply = await self.rpc(msg)
         return reply
 
@@ -20049,13 +21012,13 @@ class UpgraderFacade(Type):
     @ReturnMapping(ToolsResults)
     async def Tools(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ToolsResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ToolsResult]<~ToolsResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Upgrader', Request='Tools', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Upgrader', request='Tools', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -20064,13 +21027,13 @@ class UpgraderFacade(Type):
     @ReturnMapping(NotifyWatchResults)
     async def WatchAPIVersion(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~NotifyWatchResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~NotifyWatchResult]<~NotifyWatchResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='Upgrader', Request='WatchAPIVersion', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='Upgrader', request='WatchAPIVersion', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -20080,14 +21043,9 @@ class UserManagerFacade(Type):
     version = 1
     schema =     {'definitions': {'AddUser': {'additionalProperties': False,
                                  'properties': {'display-name': {'type': 'string'},
-                                                'model-access-permission': {'type': 'string'},
                                                 'password': {'type': 'string'},
-                                                'shared-model-tags': {'items': {'type': 'string'},
-                                                                      'type': 'array'},
                                                 'username': {'type': 'string'}},
-                                 'required': ['username',
-                                              'display-name',
-                                              'shared-model-tags'],
+                                 'required': ['username', 'display-name'],
                                  'type': 'object'},
                      'AddUserResult': {'additionalProperties': False,
                                        'properties': {'error': {'$ref': '#/definitions/Error'},
@@ -20106,69 +21064,46 @@ class UserManagerFacade(Type):
                                   'required': ['users'],
                                   'type': 'object'},
                      'Entities': {'additionalProperties': False,
-                                  'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'},
+                                  'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'},
                                                               'type': 'array'}},
-                                  'required': ['Entities'],
+                                  'required': ['entities'],
                                   'type': 'object'},
                      'Entity': {'additionalProperties': False,
-                                'properties': {'Tag': {'type': 'string'}},
-                                'required': ['Tag'],
+                                'properties': {'tag': {'type': 'string'}},
+                                'required': ['tag'],
                                 'type': 'object'},
                      'EntityPassword': {'additionalProperties': False,
-                                        'properties': {'Password': {'type': 'string'},
-                                                       'Tag': {'type': 'string'}},
-                                        'required': ['Tag', 'Password'],
+                                        'properties': {'password': {'type': 'string'},
+                                                       'tag': {'type': 'string'}},
+                                        'required': ['tag', 'password'],
                                         'type': 'object'},
                      'EntityPasswords': {'additionalProperties': False,
-                                         'properties': {'Changes': {'items': {'$ref': '#/definitions/EntityPassword'},
+                                         'properties': {'changes': {'items': {'$ref': '#/definitions/EntityPassword'},
                                                                     'type': 'array'}},
-                                         'required': ['Changes'],
+                                         'required': ['changes'],
                                          'type': 'object'},
                      'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
                      'ErrorResult': {'additionalProperties': False,
-                                     'properties': {'Error': {'$ref': '#/definitions/Error'}},
-                                     'required': ['Error'],
+                                     'properties': {'error': {'$ref': '#/definitions/Error'}},
                                      'type': 'object'},
                      'ErrorResults': {'additionalProperties': False,
-                                      'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'},
+                                      'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'},
                                                                  'type': 'array'}},
-                                      'required': ['Results'],
+                                      'required': ['results'],
                                       'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
-                     'MacaroonResult': {'additionalProperties': False,
-                                        'properties': {'error': {'$ref': '#/definitions/Error'},
-                                                       'result': {'$ref': '#/definitions/Macaroon'}},
-                                        'type': 'object'},
-                     'MacaroonResults': {'additionalProperties': False,
-                                         'properties': {'results': {'items': {'$ref': '#/definitions/MacaroonResult'},
-                                                                    'type': 'array'}},
-                                         'required': ['results'],
-                                         'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'UserInfo': {'additionalProperties': False,
-                                  'properties': {'created-by': {'type': 'string'},
+                                  'properties': {'access': {'type': 'string'},
+                                                 'created-by': {'type': 'string'},
                                                  'date-created': {'format': 'date-time',
                                                                   'type': 'string'},
                                                  'disabled': {'type': 'boolean'},
@@ -20178,6 +21113,7 @@ class UserManagerFacade(Type):
                                                  'username': {'type': 'string'}},
                                   'required': ['username',
                                                'display-name',
+                                               'access',
                                                'created-by',
                                                'date-created',
                                                'disabled'],
@@ -20197,33 +21133,19 @@ class UserManagerFacade(Type):
                                          'properties': {'results': {'items': {'$ref': '#/definitions/UserInfoResult'},
                                                                     'type': 'array'}},
                                          'required': ['results'],
-                                         'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                         'type': 'object'}},
      'properties': {'AddUser': {'properties': {'Params': {'$ref': '#/definitions/AddUsers'},
                                                'Result': {'$ref': '#/definitions/AddUserResults'}},
                                 'type': 'object'},
-                    'CreateLocalLoginMacaroon': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
-                                                                'Result': {'$ref': '#/definitions/MacaroonResults'}},
-                                                 'type': 'object'},
                     'DisableUser': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                    'Result': {'$ref': '#/definitions/ErrorResults'}},
                                     'type': 'object'},
                     'EnableUser': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
                                                   'Result': {'$ref': '#/definitions/ErrorResults'}},
                                    'type': 'object'},
+                    'RemoveUser': {'properties': {'Params': {'$ref': '#/definitions/Entities'},
+                                                  'Result': {'$ref': '#/definitions/ErrorResults'}},
+                                   'type': 'object'},
                     'SetPassword': {'properties': {'Params': {'$ref': '#/definitions/EntityPasswords'},
                                                    'Result': {'$ref': '#/definitions/ErrorResults'}},
                                     'type': 'object'},
@@ -20236,58 +21158,58 @@ class UserManagerFacade(Type):
     @ReturnMapping(AddUserResults)
     async def AddUser(self, users):
         '''
-        users : typing.Sequence[~AddUser]
-        Returns -> typing.Sequence[~AddUserResult]
+        users : typing.Sequence<+T_co>[~AddUser]<~AddUser>
+        Returns -> typing.Sequence<+T_co>[~AddUserResult]<~AddUserResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='UserManager', Request='AddUser', Version=1, Params=params)
-        params['users'] = users
+        _params = dict()
+        msg = dict(type='UserManager', request='AddUser', version=1, params=_params)
+        _params['users'] = users
         reply = await self.rpc(msg)
         return reply
 
 
 
-    @ReturnMapping(MacaroonResults)
-    async def CreateLocalLoginMacaroon(self, entities):
+    @ReturnMapping(ErrorResults)
+    async def DisableUser(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~MacaroonResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='UserManager', Request='CreateLocalLoginMacaroon', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='UserManager', request='DisableUser', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(ErrorResults)
-    async def DisableUser(self, entities):
+    async def EnableUser(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='UserManager', Request='DisableUser', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='UserManager', request='EnableUser', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
 
 
     @ReturnMapping(ErrorResults)
-    async def EnableUser(self, entities):
+    async def RemoveUser(self, entities):
         '''
-        entities : typing.Sequence[~Entity]
-        Returns -> typing.Sequence[~ErrorResult]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='UserManager', Request='EnableUser', Version=1, Params=params)
-        params['Entities'] = entities
+        _params = dict()
+        msg = dict(type='UserManager', request='RemoveUser', version=1, params=_params)
+        _params['entities'] = entities
         reply = await self.rpc(msg)
         return reply
 
@@ -20296,13 +21218,13 @@ class UserManagerFacade(Type):
     @ReturnMapping(ErrorResults)
     async def SetPassword(self, changes):
         '''
-        changes : typing.Sequence[~EntityPassword]
-        Returns -> typing.Sequence[~ErrorResult]
+        changes : typing.Sequence<+T_co>[~EntityPassword]<~EntityPassword>
+        Returns -> typing.Sequence<+T_co>[~ErrorResult]<~ErrorResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='UserManager', Request='SetPassword', Version=1, Params=params)
-        params['Changes'] = changes
+        _params = dict()
+        msg = dict(type='UserManager', request='SetPassword', version=1, params=_params)
+        _params['changes'] = changes
         reply = await self.rpc(msg)
         return reply
 
@@ -20311,15 +21233,15 @@ class UserManagerFacade(Type):
     @ReturnMapping(UserInfoResults)
     async def UserInfo(self, entities, include_disabled):
         '''
-        entities : typing.Sequence[~Entity]
+        entities : typing.Sequence<+T_co>[~Entity]<~Entity>
         include_disabled : bool
-        Returns -> typing.Sequence[~UserInfoResult]
+        Returns -> typing.Sequence<+T_co>[~UserInfoResult]<~UserInfoResult>
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='UserManager', Request='UserInfo', Version=1, Params=params)
-        params['entities'] = entities
-        params['include-disabled'] = include_disabled
+        _params = dict()
+        msg = dict(type='UserManager', request='UserInfo', version=1, params=_params)
+        _params['entities'] = entities
+        _params['include-disabled'] = include_disabled
         reply = await self.rpc(msg)
         return reply
 
@@ -20328,59 +21250,30 @@ class VolumeAttachmentsWatcherFacade(Type):
     name = 'VolumeAttachmentsWatcher'
     version = 2
     schema =     {'definitions': {'Error': {'additionalProperties': False,
-                               'properties': {'Code': {'type': 'string'},
-                                              'Info': {'$ref': '#/definitions/ErrorInfo'},
-                                              'Message': {'type': 'string'}},
-                               'required': ['Message', 'Code'],
+                               'properties': {'code': {'type': 'string'},
+                                              'info': {'$ref': '#/definitions/ErrorInfo'},
+                                              'message': {'type': 'string'}},
+                               'required': ['message', 'code'],
                                'type': 'object'},
                      'ErrorInfo': {'additionalProperties': False,
-                                   'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'},
-                                                  'MacaroonPath': {'type': 'string'}},
+                                   'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'},
+                                                  'macaroon-path': {'type': 'string'}},
                                    'type': 'object'},
-                     'Macaroon': {'additionalProperties': False,
-                                  'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'},
-                                                             'type': 'array'},
-                                                 'data': {'items': {'type': 'integer'},
-                                                          'type': 'array'},
-                                                 'id': {'$ref': '#/definitions/packet'},
-                                                 'location': {'$ref': '#/definitions/packet'},
-                                                 'sig': {'items': {'type': 'integer'},
-                                                         'type': 'array'}},
-                                  'required': ['data',
-                                               'location',
-                                               'id',
-                                               'caveats',
-                                               'sig'],
-                                  'type': 'object'},
+                     'Macaroon': {'additionalProperties': False, 'type': 'object'},
                      'MachineStorageId': {'additionalProperties': False,
-                                          'properties': {'attachmenttag': {'type': 'string'},
-                                                         'machinetag': {'type': 'string'}},
-                                          'required': ['machinetag',
-                                                       'attachmenttag'],
+                                          'properties': {'attachment-tag': {'type': 'string'},
+                                                         'machine-tag': {'type': 'string'}},
+                                          'required': ['machine-tag',
+                                                       'attachment-tag'],
                                           'type': 'object'},
                      'MachineStorageIdsWatchResult': {'additionalProperties': False,
-                                                      'properties': {'Changes': {'items': {'$ref': '#/definitions/MachineStorageId'},
+                                                      'properties': {'changes': {'items': {'$ref': '#/definitions/MachineStorageId'},
                                                                                  'type': 'array'},
-                                                                     'Error': {'$ref': '#/definitions/Error'},
-                                                                     'MachineStorageIdsWatcherId': {'type': 'string'}},
-                                                      'required': ['MachineStorageIdsWatcherId',
-                                                                   'Changes',
-                                                                   'Error'],
-                                                      'type': 'object'},
-                     'caveat': {'additionalProperties': False,
-                                'properties': {'caveatId': {'$ref': '#/definitions/packet'},
-                                               'location': {'$ref': '#/definitions/packet'},
-                                               'verificationId': {'$ref': '#/definitions/packet'}},
-                                'required': ['location',
-                                             'caveatId',
-                                             'verificationId'],
-                                'type': 'object'},
-                     'packet': {'additionalProperties': False,
-                                'properties': {'headerLen': {'type': 'integer'},
-                                               'start': {'type': 'integer'},
-                                               'totalLen': {'type': 'integer'}},
-                                'required': ['start', 'totalLen', 'headerLen'],
-                                'type': 'object'}},
+                                                                     'error': {'$ref': '#/definitions/Error'},
+                                                                     'watcher-id': {'type': 'string'}},
+                                                      'required': ['watcher-id',
+                                                                   'changes'],
+                                                      'type': 'object'}},
      'properties': {'Next': {'properties': {'Result': {'$ref': '#/definitions/MachineStorageIdsWatchResult'}},
                              'type': 'object'},
                     'Stop': {'type': 'object'}},
@@ -20391,11 +21284,11 @@ class VolumeAttachmentsWatcherFacade(Type):
     async def Next(self):
         '''
 
-        Returns -> typing.Union[typing.Sequence[~MachineStorageId], _ForwardRef('Error')]
+        Returns -> typing.Union[typing.Sequence<+T_co>[~MachineStorageId]<~MachineStorageId>, _ForwardRef('Error')]
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='VolumeAttachmentsWatcher', Request='Next', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='VolumeAttachmentsWatcher', request='Next', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply
@@ -20409,8 +21302,8 @@ class VolumeAttachmentsWatcherFacade(Type):
         Returns -> None
         '''
         # map input types to rpc msg
-        params = dict()
-        msg = dict(Type='VolumeAttachmentsWatcher', Request='Stop', Version=2, Params=params)
+        _params = dict()
+        msg = dict(type='VolumeAttachmentsWatcher', request='Stop', version=2, params=_params)
 
         reply = await self.rpc(msg)
         return reply