diff --git a/octavia_dashboard/api/rest/lbaasv2.py b/octavia_dashboard/api/rest/lbaasv2.py
index baa46fb8..e0f7ae8c 100644
--- a/octavia_dashboard/api/rest/lbaasv2.py
+++ b/octavia_dashboard/api/rest/lbaasv2.py
@@ -126,10 +126,10 @@ def create_loadbalancer(request):
     conn = _get_sdk_connection(request)
     loadbalancer = conn.load_balancer.create_load_balancer(
         project_id=request.user.project_id,
-        vip_subnet_id=data['loadbalancer']['subnet'],
+        vip_subnet_id=data['loadbalancer']['vip_subnet_id'],
         name=data['loadbalancer'].get('name'),
         description=data['loadbalancer'].get('description'),
-        vip_address=data['loadbalancer'].get('ip'),
+        vip_address=data['loadbalancer'].get('vip_address'),
         admin_state_up=data['loadbalancer'].get('admin_state_up')
     )
 
@@ -162,7 +162,7 @@ def create_listener(request, **kwargs):
     # https://bugs.launchpad.net/octavia/+bug/1714294
     listener = conn.load_balancer.create_listener(
         protocol=data['listener']['protocol'],
-        protocol_port=data['listener']['port'],
+        protocol_port=data['listener']['protocol_port'],
         load_balancer_id=kwargs['loadbalancer_id'],
         name=data['listener'].get('name'),
         description=data['listener'].get('description'),
@@ -227,23 +227,11 @@ def create_pool(request, **kwargs):
     """
     data = request.DATA
 
-    session_persistence_type = data['pool'].get('type')
-    if session_persistence_type is None:
-        session_persistence = None
-    else:
-        cookie = data['pool'].get('cookie')
-        if session_persistence_type != 'APP_COOKIE':
-            cookie = None
-        session_persistence = {
-            'type': session_persistence_type,
-            'cookie_name': cookie
-        }
-
     conn = _get_sdk_connection(request)
     pool = conn.load_balancer.create_pool(
         protocol=data['pool']['protocol'],
-        lb_algorithm=data['pool']['method'],
-        session_persistence=session_persistence,
+        lb_algorithm=data['pool']['lb_algorithm'],
+        session_persistence=data['pool'].get('session_persistence'),
         listener_id=kwargs['listener_id'],
         loadbalancer_id=kwargs['loadbalancer_id'],
         name=data['pool'].get('name'),
@@ -273,14 +261,14 @@ def create_health_monitor(request, **kwargs):
     conn = _get_sdk_connection(request)
     health_mon = conn.load_balancer.create_health_monitor(
         type=data['monitor']['type'],
-        delay=data['monitor']['interval'],
+        delay=data['monitor']['delay'],
         timeout=data['monitor']['timeout'],
-        max_retries=data['monitor']['retry'],
-        max_retries_down=data['monitor']['retry_down'],
+        max_retries=data['monitor']['max_retries'],
+        max_retries_down=data['monitor']['max_retries_down'],
         pool_id=kwargs['pool_id'],
-        http_method=data['monitor'].get('method'),
-        url_path=data['monitor'].get('path'),
-        expected_codes=data['monitor'].get('status'),
+        http_method=data['monitor'].get('http_method'),
+        url_path=data['monitor'].get('url_path'),
+        expected_codes=data['monitor'].get('expected_codes'),
         admin_state_up=data['monitor'].get('admin_state_up')
     )
 
@@ -311,8 +299,8 @@ def add_member(request, **kwargs):
     member = conn.load_balancer.create_member(
         pool_id,
         address=member['address'],
-        protocol_port=member['port'],
-        subnet_id=member['subnet'],
+        protocol_port=member['protocol_port'],
+        subnet_id=member['subnet_id'],
         weight=member.get('weight'),
         monitor_address=monitor_address if monitor_address else None,
         monitor_port=member.get('monitor_port'),
@@ -467,23 +455,11 @@ def update_pool(request, **kwargs):
     pool_id = data['pool'].get('id')
     loadbalancer_id = data.get('loadbalancer_id')
 
-    session_persistence_type = data['pool'].get('type')
-    if session_persistence_type is None:
-        session_persistence = None
-    else:
-        cookie = data['pool'].get('cookie')
-        if session_persistence_type != 'APP_COOKIE':
-            cookie = None
-        session_persistence = {
-            'type': session_persistence_type,
-            'cookie_name': cookie
-        }
-
     conn = _get_sdk_connection(request)
     pool = conn.load_balancer.update_pool(
         pool=pool_id,
-        lb_algorithm=data['pool']['method'],
-        session_persistence=session_persistence,
+        lb_algorithm=data['pool']['lb_algorithm'],
+        session_persistence=data['pool'].get('session_persistence'),
         name=data['pool'].get('name'),
         description=data['pool'].get('description'),
         admin_state_up=data['pool'].get('admin_state_up')
@@ -521,13 +497,13 @@ def update_monitor(request, **kwargs):
     conn = _get_sdk_connection(request)
     healthmonitor = conn.load_balancer.update_health_monitor(
         monitor_id,
-        delay=data['monitor'].get('interval'),
+        delay=data['monitor'].get('delay'),
         timeout=data['monitor'].get('timeout'),
-        max_retries=data['monitor'].get('retry'),
-        max_retries_down=data['monitor'].get('retry_down'),
-        http_method=data['monitor'].get('method'),
-        url_path=data['monitor'].get('path'),
-        expected_codes=data['monitor'].get('status'),
+        max_retries=data['monitor'].get('max_retries'),
+        max_retries_down=data['monitor'].get('max_retries_down'),
+        http_method=data['monitor'].get('http_method'),
+        url_path=data['monitor'].get('url_path'),
+        expected_codes=data['monitor'].get('expected_codes'),
         admin_state_up=data['monitor'].get('admin_state_up')
     )
 
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/members/members.module.js b/octavia_dashboard/static/dashboard/project/lbaasv2/members/members.module.js
index c1ad2606..f16fc973 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/members/members.module.js
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/members/members.module.js
@@ -163,11 +163,11 @@
       },
       monitor_address: {
         label: gettext('Monitor Address'),
-        filters: ['noName']
+        filters: ['noValue']
       },
       monitor_port: {
         label: gettext('Monitor Port'),
-        filters: ['noName']
+        filters: ['noValue']
       }
     };
   }
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.controller.js b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.controller.js
index 61358350..70716c54 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.controller.js
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.controller.js
@@ -60,7 +60,7 @@
       while (listenerPortExists(defaultPort)) {
         defaultPort += 1;
       }
-      $scope.model.spec.listener.port = defaultPort;
+      $scope.model.spec.listener.protocol_port = defaultPort;
 
       var members = $scope.model.members.concat($scope.model.spec.members);
       members.forEach(function setMemberPort(member) {
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.controller.spec.js b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.controller.spec.js
index 1cfc9938..9eb9f574 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.controller.spec.js
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.controller.spec.js
@@ -32,7 +32,7 @@
         };
         listener = {
           protocol: null,
-          port: 80
+          protocol_port: 80
         };
         scope = {
           model: {
@@ -55,17 +55,17 @@
 
       it('should update port on protocol change to HTTP', function() {
         ctrl.protocolChange('HTTP');
-        expect(listener.port).toBe(81);
+        expect(listener.protocol_port).toBe(81);
       });
 
       it('should update port on protocol change to TERMINATED_HTTPS', function() {
         ctrl.protocolChange('TERMINATED_HTTPS');
-        expect(listener.port).toBe(443);
+        expect(listener.protocol_port).toBe(443);
       });
 
       it('should update port on protocol change to TCP', function() {
         ctrl.protocolChange('TCP');
-        expect(listener.port).toBeUndefined();
+        expect(listener.protocol_port).toBeUndefined();
       });
 
       it('should update member ports on protocol change to TERMINATED_HTTPS', function() {
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.html b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.html
index 6c7ac15d..1a26d935 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.html
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.html
@@ -47,7 +47,7 @@
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
         <input name="port" id="port" type="number" class="form-control"
-               ng-model="model.spec.listener.port" ng-pattern="/^\d+$/" min="1" max="65535"
+               ng-model="model.spec.listener.protocol_port" ng-pattern="/^\d+$/" min="1" max="65535"
                ng-required="true" ng-disabled="model.context.id"
                validate-unique="model.listenerPorts">
         <span class="help-block" ng-show="(listenerDetailsForm.port.$error.number || listenerDetailsForm.port.$error.required) && listenerDetailsForm.port.$dirty">
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.html b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.html
index 76f4bfb5..3342eeb2 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.html
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.html
@@ -28,7 +28,7 @@
         ng-class="{ 'has-error': loadBalancerDetailsForm.ip.$invalid && loadBalancerDetailsForm.ip.$dirty }">
         <label translate class="control-label" for="ip">IP address</label>
         <input name="ip" id="ip" type="text" class="form-control"
-               ng-model="model.spec.loadbalancer.ip" ng-pattern="::ctrl.ipPattern"
+               ng-model="model.spec.loadbalancer.vip_address" ng-pattern="::ctrl.ipPattern"
                ng-disabled="model.context.id">
         <span class="help-block" ng-show="loadBalancerDetailsForm.ip.$invalid && loadBalancerDetailsForm.ip.$dirty">
           {$ ::ctrl.ipError $}
@@ -44,7 +44,7 @@
         </label>
         <select class="form-control" name="subnet" id="subnet"
                 ng-options="subnet.name || subnet.id for subnet in model.subnets"
-                ng-model="model.spec.loadbalancer.subnet" ng-required="true"
+                ng-model="model.spec.loadbalancer.vip_subnet_id" ng-required="true"
                 ng-disabled="model.context.id">
         </select>
       </div>
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.controller.js b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.controller.js
index 91f7d880..884ddfc6 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.controller.js
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.controller.js
@@ -118,8 +118,8 @@
       $scope.model.spec.members.push({
         id: memberCounter++,
         address: null,
-        subnet: null,
-        port: { HTTP: 80 }[protocol],
+        subnet_id: null,
+        protocol_port: { HTTP: 80 }[protocol],
         weight: 1,
         monitor_address: null,
         monitor_port: null,
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.controller.spec.js b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.controller.spec.js
index ae32b55c..ce1d9902 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.controller.spec.js
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.controller.spec.js
@@ -34,7 +34,7 @@
           name: 'foo',
           description: 'bar',
           weight: 1,
-          port: 80,
+          protocol_port: 80,
           address: { ip: '1.2.3.4', subnet: '1' },
           addresses: [{ ip: '1.2.3.4', subnet: '1' },
                       { ip: '2.3.4.5', subnet: '2' }]
@@ -94,7 +94,7 @@
       expect(model.spec.members.length).toBe(1);
       expect(model.spec.members[0].id).toBe(0);
       expect(model.spec.members[0].address).toBeNull();
-      expect(model.spec.members[0].subnet).toBeNull();
+      expect(model.spec.members[0].subnet_id).toBeNull();
     });
 
     it('should allocate a given member', function() {
@@ -102,8 +102,8 @@
       expect(model.spec.members.length).toBe(1);
       expect(model.spec.members[0].id).toBe(0);
       expect(model.spec.members[0].address).toEqual(model.members[0].address);
-      expect(model.spec.members[0].subnet).toBeUndefined();
-      expect(model.spec.members[0].port).toEqual(model.members[0].port);
+      expect(model.spec.members[0].subnet_id).toBeUndefined();
+      expect(model.spec.members[0].protocol_port).toEqual(model.members[0].protocol_port);
     });
 
     it('should deallocate a given member', function() {
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.html b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.html
index 7a9c2955..6d2acdb6 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.html
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.html
@@ -68,7 +68,7 @@
               <div ng-if="!row.addresses" class="form-group required">
                 <select name="{$ ::row.id $}-subnet" class="form-control"
                         ng-options="subnet.name for subnet in model.subnets"
-                        ng-model="row.subnet" ng-required="true"
+                        ng-model="row.subnet_id" ng-required="true"
                         ng-disabled="row.allocatedMember">
                 </select>
               </div>
@@ -78,7 +78,7 @@
               <div class="form-group required member-port"
                    ng-class="{ 'has-error': memberDetailsForm['{$ ::row.id $}-port'].$invalid && memberDetailsForm['{$ ::row.id $}-port'].$dirty }">
                 <input name="{$ ::row.id $}-port" type="number" class="form-control"
-                       ng-model="row.port" ng-pattern="/^\d+$/" min="1" max="65535"
+                       ng-model="row.protocol_port" ng-pattern="/^\d+$/" min="1" max="65535"
                        ng-required="true" ng-disabled="row.allocatedMember"
                        popover-placement="top" popover-append-to-body="true"
                        popover-trigger="focus"
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js
index 5c910d75..175da853 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js
@@ -57,8 +57,7 @@
     novaAPI,
     lbaasv2API,
     barbicanAPI,
-    serviceCatalog,
-    gettext
+    serviceCatalog
   ) {
     var ports, keymanagerPromise;
 
@@ -82,7 +81,6 @@
 
       spec: null,
 
-      visibleResources: [],
       subnets: [],
       members: [],
       listenerProtocols: ['HTTP', 'TCP', 'TERMINATED_HTTPS', 'HTTPS'],
@@ -132,7 +130,6 @@
         submit: null
       };
 
-      model.visibleResources = [];
       model.certificates = [];
       model.listenerPorts = [];
 
@@ -142,23 +139,24 @@
         loadbalancer: {
           name: null,
           description: null,
-          ip: null,
-          subnet: null,
+          vip_address: null,
+          vip_subnet_id: null,
           admin_state_up: true
         },
         listener: {
           id: null,
-          name: gettext('Listener 1'),
+          name: null,
           description: null,
           protocol: null,
-          port: null,
+          protocol_port: null,
           connection_limit: -1,
           admin_state_up: true,
+          default_pool: null,
           default_pool_id: null
         },
         l7policy: {
           id: null,
-          name: gettext('L7 Policy 1'),
+          name: null,
           description: null,
           action: null,
           position: null,
@@ -177,24 +175,27 @@
         },
         pool: {
           id: null,
-          name: gettext('Pool 1'),
+          name: null,
           description: null,
           protocol: null,
-          method: null,
-          type: null,
-          cookie: null,
+          lb_algorithm: null,
+          session_persistence: {
+            type: null,
+            cookie_name: null
+          },
           admin_state_up: true
         },
         monitor: {
           id: null,
+          name: null,
           type: null,
-          interval: 5,
-          retry: 3,
-          retry_down: 3,
+          delay: 5,
+          max_retries: 3,
+          max_retries_down: 3,
           timeout: 5,
-          method: 'GET',
-          status: '200',
-          path: '/',
+          http_method: 'GET',
+          expected_codes: '200',
+          url_path: '/',
           admin_state_up: true
         },
         members: [],
@@ -249,7 +250,6 @@
     function initCreateLoadBalancer(keymanagerPromise) {
       model.context.submit = createLoadBalancer;
       return $q.all([
-        lbaasv2API.getLoadBalancers().then(onGetLoadBalancers),
         neutronAPI.getSubnets().then(onGetSubnets),
         neutronAPI.getPorts().then(onGetPorts),
         novaAPI.getServers().then(onGetServers),
@@ -436,22 +436,22 @@
     function cleanFinalSpecLoadBalancer(finalSpec) {
       var context = model.context;
 
-      // Load balancer requires subnet
-      if (!finalSpec.loadbalancer.subnet) {
+      // Load balancer requires vip_subnet_id
+      if (!finalSpec.loadbalancer.vip_subnet_id) {
         delete finalSpec.loadbalancer;
       } else {
-        finalSpec.loadbalancer.subnet = finalSpec.loadbalancer.subnet.id;
+        finalSpec.loadbalancer.vip_subnet_id = finalSpec.loadbalancer.vip_subnet_id.id;
       }
 
       // Cannot edit the IP or subnet
       if (context.resource === 'loadbalancer' && context.id) {
-        delete finalSpec.subnet;
-        delete finalSpec.ip;
+        delete finalSpec.vip_subnet_id;
+        delete finalSpec.vip_address;
       }
     }
 
     function cleanFinalSpecListener(finalSpec) {
-      if (!finalSpec.listener.protocol || !finalSpec.listener.port) {
+      if (!finalSpec.listener.protocol || !finalSpec.listener.protocol_port) {
         // Listener requires protocol and port
         delete finalSpec.listener;
         delete finalSpec.certificates;
@@ -470,13 +470,20 @@
     function cleanFinalSpecPool(finalSpec) {
 
       // Pool requires method
-      if (!finalSpec.pool.method) {
+      if (!finalSpec.pool.lb_algorithm) {
         delete finalSpec.pool;
       } else {
         // The pool protocol must be HTTP if the listener protocol is TERMINATED_HTTPS and
         // otherwise has to match it.
         var protocol = finalSpec.listener ? finalSpec.listener.protocol : finalSpec.pool.protocol;
         finalSpec.pool.protocol = protocol === 'TERMINATED_HTTPS' ? 'HTTP' : protocol;
+        if (angular.isObject(finalSpec.pool.session_persistence)) {
+          if (!finalSpec.pool.session_persistence.type) {
+            finalSpec.pool.session_persistence = null;
+          } else if (finalSpec.pool.session_persistence.type !== 'APP_COOKIE') {
+            finalSpec.pool.session_persistence.cookie_name = null;
+          }
+        }
       }
     }
 
@@ -488,7 +495,7 @@
 
       var members = [];
       angular.forEach(finalSpec.members, function cleanMember(member) {
-        if (member.address && member.port) {
+        if (member.address && member.protocol_port) {
           var propsToRemove = ['name', 'description', 'addresses', 'allocatedMember'];
           propsToRemove.forEach(function deleteProperty(prop) {
             if (angular.isDefined(member[prop])) {
@@ -496,12 +503,12 @@
             }
           });
           if (angular.isObject(member.address)) {
-            member.subnet = member.address.subnet;
+            member.subnet_id = member.address.subnet;
             member.address = member.address.ip;
-          } else if (member.subnet) {
-            member.subnet = member.subnet.id;
+          } else if (member.subnet_id) {
+            member.subnet_id = member.subnet_id.id;
           } else {
-            delete member.subnet;
+            delete member.subnet_id;
           }
           members.push(member);
         }
@@ -515,9 +522,9 @@
 
     function cleanFinalSpecMonitor(finalSpec) {
 
-      // Monitor requires an interval, retry count, and timeout
-      if (!angular.isNumber(finalSpec.monitor.interval) ||
-          !angular.isNumber(finalSpec.monitor.retry) ||
+      // Monitor requires delay, max_retries, and timeout
+      if (!angular.isNumber(finalSpec.monitor.delay) ||
+          !angular.isNumber(finalSpec.monitor.max_retries) ||
           !angular.isNumber(finalSpec.monitor.timeout)) {
         delete finalSpec.monitor;
         return;
@@ -525,9 +532,9 @@
 
       // Only include necessary monitor properties
       if (finalSpec.monitor.type !== 'HTTP') {
-        delete finalSpec.monitor.method;
-        delete finalSpec.monitor.status;
-        delete finalSpec.monitor.path;
+        delete finalSpec.monitor.http_method;
+        delete finalSpec.monitor.expected_codes;
+        delete finalSpec.monitor.url_path;
       }
     }
 
@@ -541,33 +548,10 @@
       });
     }
 
-    function onGetLoadBalancers(response) {
-      var existingNames = {};
-      angular.forEach(response.data.items, function nameExists(lb) {
-        existingNames[lb.name] = 1;
-      });
-      var name;
-      var index = response.data.items.length;
-      do {
-        index += 1;
-        name = interpolate(gettext('Load Balancer %(index)s'), { index: index }, true);
-      } while (name in existingNames);
-      model.spec.loadbalancer.name = name;
-    }
-
     function onGetListeners(response) {
-      var existingNames = {};
-      angular.forEach(response.data.items, function nameExists(listener) {
-        existingNames[listener.name] = 1;
+      angular.forEach(response.data.items, function addPort(listener) {
         model.listenerPorts.push(listener.protocol_port);
       });
-      var name;
-      var index = response.data.items.length;
-      do {
-        index += 1;
-        name = interpolate(gettext('Listener %(index)s'), { index: index }, true);
-      } while (name in existingNames);
-      model.spec.listener.name = name;
     }
 
     function onGetPools(response) {
@@ -634,7 +618,7 @@
         member.address = member.addresses[0];
 
         if (model.spec.pool.protocol) {
-          member.port = {HTTP: 80}[model.spec.pool.protocol];
+          member.protocol_port = {HTTP: 80}[model.spec.pool.protocol];
         }
       });
     }
@@ -675,7 +659,6 @@
       setListenerSpec(result.listener || result);
 
       if (result.listener) {
-        model.visibleResources.push('listener');
         model.spec.loadbalancer_id = result.listener.load_balancers[0].id;
 
         if (result.listener.protocol === 'TERMINATED_HTTPS') {
@@ -688,15 +671,12 @@
               });
             });
           });
-          model.visibleResources.push('certificates');
           $('#wizard-side-nav ul li:last').show();
         }
       }
 
       if (result.pool) {
         setPoolSpec(result.pool);
-        model.visibleResources.push('pool');
-        model.visibleResources.push('members');
 
         if (result.members) {
           setMembersSpec(result.members);
@@ -704,7 +684,6 @@
 
         if (result.monitor) {
           setMonitorSpec(result.monitor);
-          model.visibleResources.push('monitor');
         }
       }
     }
@@ -727,16 +706,12 @@
       setPoolSpec(result.pool || result);
 
       if (result.pool) {
-        model.visibleResources.push('pool');
-        model.visibleResources.push('members');
-
         if (result.members) {
           setMembersSpec(result.members);
         }
 
         if (result.monitor) {
           setMonitorSpec(result.monitor);
-          model.visibleResources.push('monitor');
         }
       }
     }
@@ -745,8 +720,8 @@
       var spec = model.spec.loadbalancer;
       spec.name = loadbalancer.name;
       spec.description = loadbalancer.description;
-      spec.ip = loadbalancer.vip_address;
-      spec.subnet = loadbalancer.vip_subnet_id;
+      spec.vip_address = loadbalancer.vip_address;
+      spec.vip_subnet_id = loadbalancer.vip_subnet_id;
       spec.admin_state_up = loadbalancer.admin_state_up;
     }
 
@@ -756,7 +731,7 @@
       spec.name = listener.name;
       spec.description = listener.description;
       spec.protocol = listener.protocol;
-      spec.port = listener.protocol_port;
+      spec.protocol_port = listener.protocol_port;
       spec.connection_limit = listener.connection_limit;
       spec.admin_state_up = listener.admin_state_up;
       spec.default_pool_id = listener.default_pool_id;
@@ -791,18 +766,9 @@
       spec.name = pool.name;
       spec.description = pool.description;
       spec.protocol = pool.protocol;
-      spec.method = pool.lb_algorithm;
+      spec.lb_algorithm = pool.lb_algorithm;
       spec.admin_state_up = pool.admin_state_up;
-      if (angular.isObject(pool.session_persistence)) {
-        var type = pool.session_persistence.type;
-        var cookie = pool.session_persistence.cookie_name;
-        if (type) {
-          spec.type = type;
-        }
-        if (type === 'APP_COOKIE' && cookie) {
-          spec.cookie = cookie;
-        }
-      }
+      spec.session_persistence = pool.session_persistence;
     }
 
     function setMembersSpec(membersList) {
@@ -813,8 +779,8 @@
         members.push({
           id: member.id,
           address: member.address,
-          subnet: mapSubnetObj(member.subnet_id),
-          port: member.protocol_port,
+          subnet_id: mapSubnetObj(member.subnet_id),
+          protocol_port: member.protocol_port,
           weight: member.weight,
           monitor_address: member.monitor_address,
           monitor_port: member.monitor_port,
@@ -829,13 +795,13 @@
       var spec = model.spec.monitor;
       spec.id = monitor.id;
       spec.type = monitor.type;
-      spec.interval = monitor.delay;
+      spec.delay = monitor.delay;
       spec.timeout = monitor.timeout;
-      spec.retry = monitor.max_retries;
-      spec.retry_down = monitor.max_retries_down;
-      spec.method = monitor.http_method;
-      spec.status = monitor.expected_codes;
-      spec.path = monitor.url_path;
+      spec.max_retries = monitor.max_retries;
+      spec.max_retries_down = monitor.max_retries_down;
+      spec.http_method = monitor.http_method;
+      spec.expected_codes = monitor.expected_codes;
+      spec.url_path = monitor.url_path;
       spec.admin_state_up = monitor.admin_state_up;
     }
 
@@ -884,9 +850,9 @@
 
     function initSubnet() {
       var subnet = model.subnets.filter(function filterSubnetsByLoadBalancer(s) {
-        return s.id === model.spec.loadbalancer.subnet;
+        return s.id === model.spec.loadbalancer.vip_subnet_id;
       })[0];
-      model.spec.loadbalancer.subnet = subnet;
+      model.spec.loadbalancer.vip_subnet_id = subnet;
     }
 
     function mapSubnetObj(subnetId) {
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js
index eec254be..5a5c3aee 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js
@@ -394,7 +394,7 @@
         expect(model.certificates).toEqual([]);
       });
 
-      it('has empty listener ports array', function() {
+      it('has empty listener protocol_ports array', function() {
         expect(model.listenerPorts).toEqual([]);
       });
 
@@ -402,7 +402,7 @@
         expect(model.listenerProtocols).toEqual(['HTTP', 'TCP', 'TERMINATED_HTTPS', 'HTTPS']);
       });
 
-      it('has array of pool methods', function() {
+      it('has array of pool lb_algorithms', function() {
         expect(model.methods).toEqual(['LEAST_CONNECTIONS', 'ROUND_ROBIN', 'SOURCE_IP']);
       });
 
@@ -414,7 +414,7 @@
         expect(model.monitorTypes).toEqual(['HTTP', 'PING', 'TCP']);
       });
 
-      it('has array of monitor methods', function() {
+      it('has array of monitor http_methods', function() {
         expect(model.monitorMethods).toEqual(['GET', 'HEAD']);
       });
 
@@ -457,9 +457,9 @@
       });
 
       it('should initialize names', function() {
-        expect(model.spec.loadbalancer.name).toBe('Load Balancer 4');
-        expect(model.spec.listener.name).toBe('Listener 1');
-        expect(model.spec.pool.name).toBe('Pool 1');
+        expect(model.spec.loadbalancer.name).toBeNull();
+        expect(model.spec.listener.name).toBeNull();
+        expect(model.spec.pool.name).toBeNull();
       });
 
       it('should initialize context properties', function() {
@@ -495,8 +495,8 @@
       });
 
       it('should initialize names', function() {
-        expect(model.spec.listener.name).toBe('Listener 4');
-        expect(model.spec.pool.name).toBe('Pool 1');
+        expect(model.spec.listener.name).toBeNull();
+        expect(model.spec.pool.name).toBeNull();
       });
 
       it('should initialize context properties', function() {
@@ -534,7 +534,7 @@
       });
 
       it('should initialize names', function() {
-        expect(model.spec.l7policy.name).toBe('L7 Policy 1');
+        expect(model.spec.l7policy.name).toBeNull();
       });
 
       it('should initialize context properties', function() {
@@ -610,7 +610,7 @@
       });
 
       it('should initialize names', function() {
-        expect(model.spec.pool.name).toBe('Pool 1');
+        expect(model.spec.pool.name).toBeNull();
       });
 
       it('should initialize context properties', function() {
@@ -648,7 +648,7 @@
       });
 
       it('should initialize names', function() {
-        expect(model.spec.pool.name).toBe('Pool 1');
+        expect(model.spec.pool.name).toBeNull();
       });
 
       it('should initialize context properties', function() {
@@ -714,38 +714,38 @@
       it('should initialize loadbalancer model spec properties', function() {
         expect(model.spec.loadbalancer.name).toEqual('Load Balancer 1');
         expect(model.spec.loadbalancer.description).toEqual('');
-        expect(model.spec.loadbalancer.ip).toEqual('1.2.3.4');
-        expect(model.spec.loadbalancer.subnet).toEqual({ id: 'subnet-1', name: 'subnet-1' });
+        expect(model.spec.loadbalancer.vip_address).toEqual('1.2.3.4');
+        expect(model.spec.loadbalancer.vip_subnet_id).toEqual({ id: 'subnet-1', name: 'subnet-1' });
       });
 
       it('should not initialize listener model spec properties', function() {
         expect(model.spec.listener.id).toBeNull();
-        expect(model.spec.listener.name).toBe('Listener 1');
+        expect(model.spec.listener.name).toBeNull();
         expect(model.spec.listener.description).toBeNull();
         expect(model.spec.listener.protocol).toBeNull();
-        expect(model.spec.listener.port).toBeNull();
+        expect(model.spec.listener.protocol_port).toBeNull();
         expect(model.spec.listener.connection_limit).toBe(-1);
       });
 
       it('should not initialize pool model spec properties', function() {
         expect(model.spec.pool.id).toBeNull();
-        expect(model.spec.pool.name).toBe('Pool 1');
+        expect(model.spec.pool.name).toBeNull();
         expect(model.spec.pool.description).toBeNull();
         expect(model.spec.pool.protocol).toBeNull();
-        expect(model.spec.pool.method).toBeNull();
-        expect(model.spec.pool.type).toBeNull();
-        expect(model.spec.pool.cookie).toBeNull();
+        expect(model.spec.pool.lb_algorithm).toBeNull();
+        expect(model.spec.pool.session_persistence.type).toBeNull();
+        expect(model.spec.pool.session_persistence.cookie_name).toBeNull();
       });
 
       it('should initialize monitor model spec properties', function() {
         expect(model.spec.monitor.type).toBeNull();
-        expect(model.spec.monitor.interval).toBe(5);
-        expect(model.spec.monitor.retry).toBe(3);
-        expect(model.spec.monitor.retry_down).toBe(3);
+        expect(model.spec.monitor.delay).toBe(5);
+        expect(model.spec.monitor.max_retries).toBe(3);
+        expect(model.spec.monitor.max_retries_down).toBe(3);
         expect(model.spec.monitor.timeout).toBe(5);
-        expect(model.spec.monitor.method).toBe('GET');
-        expect(model.spec.monitor.status).toBe('200');
-        expect(model.spec.monitor.path).toBe('/');
+        expect(model.spec.monitor.http_method).toBe('GET');
+        expect(model.spec.monitor.expected_codes).toBe('200');
+        expect(model.spec.monitor.url_path).toBe('/');
       });
 
       it('should not initialize any members in the model spec', function() {
@@ -785,13 +785,13 @@
         expect(model.certificatesError).toBe(false);
         expect(model.spec.monitor.id).toBe('1234');
         expect(model.spec.monitor.type).toBe('HTTP');
-        expect(model.spec.monitor.interval).toBe(1);
+        expect(model.spec.monitor.delay).toBe(1);
         expect(model.spec.monitor.timeout).toBe(1);
-        expect(model.spec.monitor.retry).toBe(1);
-        expect(model.spec.monitor.retry_down).toBe(1);
-        expect(model.spec.monitor.method).toBe('POST');
-        expect(model.spec.monitor.status).toBe('200');
-        expect(model.spec.monitor.path).toBe('/test');
+        expect(model.spec.monitor.max_retries).toBe(1);
+        expect(model.spec.monitor.max_retries_down).toBe(1);
+        expect(model.spec.monitor.http_method).toBe('POST');
+        expect(model.spec.monitor.expected_codes).toBe('200');
+        expect(model.spec.monitor.url_path).toBe('/test');
       });
 
       it('should initialize context properties', function() {
@@ -858,8 +858,8 @@
       it('should initialize all loadbalancer properties to null', function() {
         expect(model.spec.loadbalancer.name).toBeNull();
         expect(model.spec.loadbalancer.description).toBeNull();
-        expect(model.spec.loadbalancer.ip).toBeNull();
-        expect(model.spec.loadbalancer.subnet).toBeNull();
+        expect(model.spec.loadbalancer.vip_address).toBeNull();
+        expect(model.spec.loadbalancer.vip_subnet_id).toBeNull();
       });
 
       it('should initialize all listener properties', function() {
@@ -867,7 +867,7 @@
         expect(model.spec.listener.name).toBe('Listener 1');
         expect(model.spec.listener.description).toBe('listener description');
         expect(model.spec.listener.protocol).toBe('HTTP');
-        expect(model.spec.listener.port).toBe(80);
+        expect(model.spec.listener.protocol_port).toBe(80);
         expect(model.spec.listener.connection_limit).toBe(999);
       });
 
@@ -876,33 +876,33 @@
         expect(model.spec.pool.name).toBe('Pool 1');
         expect(model.spec.pool.description).toBe('pool description');
         expect(model.spec.pool.protocol).toBe('HTTP');
-        expect(model.spec.pool.method).toBe('ROUND_ROBIN');
-        expect(model.spec.pool.type).toBe('APP_COOKIE');
-        expect(model.spec.pool.cookie).toBe('cookie_name');
+        expect(model.spec.pool.lb_algorithm).toBe('ROUND_ROBIN');
+        expect(model.spec.pool.session_persistence.type).toBe('APP_COOKIE');
+        expect(model.spec.pool.session_persistence.cookie_name).toBe('cookie_name');
       });
 
       it('should initialize all monitor properties', function() {
         expect(model.spec.monitor.id).toBe('1234');
         expect(model.spec.monitor.type).toBe('HTTP');
-        expect(model.spec.monitor.interval).toBe(1);
-        expect(model.spec.monitor.retry).toBe(1);
-        expect(model.spec.monitor.retry_down).toBe(1);
+        expect(model.spec.monitor.delay).toBe(1);
+        expect(model.spec.monitor.max_retries).toBe(1);
+        expect(model.spec.monitor.max_retries_down).toBe(1);
         expect(model.spec.monitor.timeout).toBe(1);
-        expect(model.spec.monitor.method).toBe('POST');
-        expect(model.spec.monitor.status).toBe('200');
-        expect(model.spec.monitor.path).toBe('/test');
+        expect(model.spec.monitor.http_method).toBe('POST');
+        expect(model.spec.monitor.expected_codes).toBe('200');
+        expect(model.spec.monitor.url_path).toBe('/test');
       });
 
       it('should initialize members and properties', function() {
         expect(model.spec.members[0].id).toBe('1234');
         expect(model.spec.members[0].address).toBe('1.2.3.4');
-        expect(model.spec.members[0].subnet).toEqual({ id: 'subnet-1', name: 'subnet-1' });
-        expect(model.spec.members[0].port).toBe(80);
+        expect(model.spec.members[0].subnet_id).toEqual({ id: 'subnet-1', name: 'subnet-1' });
+        expect(model.spec.members[0].protocol_port).toBe(80);
         expect(model.spec.members[0].weight).toBe(1);
         expect(model.spec.members[1].id).toBe('5678');
         expect(model.spec.members[1].address).toBe('5.6.7.8');
-        expect(model.spec.members[1].subnet).toEqual({ id: 'subnet-1', name: 'subnet-1' });
-        expect(model.spec.members[1].port).toBe(80);
+        expect(model.spec.members[1].subnet_id).toEqual({ id: 'subnet-1', name: 'subnet-1' });
+        expect(model.spec.members[1].protocol_port).toBe(80);
         expect(model.spec.members[1].weight).toBe(1);
       });
 
@@ -989,16 +989,16 @@
       it('should initialize all loadbalancer properties to null', function() {
         expect(model.spec.loadbalancer.name).toBeNull();
         expect(model.spec.loadbalancer.description).toBeNull();
-        expect(model.spec.loadbalancer.ip).toBeNull();
-        expect(model.spec.loadbalancer.subnet).toBeNull();
+        expect(model.spec.loadbalancer.vip_address).toBeNull();
+        expect(model.spec.loadbalancer.vip_subnet_id).toBeNull();
       });
 
       it('should initialize all listener properties to null', function() {
         expect(model.spec.listener.id).toBeNull();
-        expect(model.spec.listener.name).toBe('Listener 1');
+        expect(model.spec.listener.name).toBeNull();
         expect(model.spec.listener.description).toBeNull();
         expect(model.spec.listener.protocol).toBeNull();
-        expect(model.spec.listener.port).toBeNull();
+        expect(model.spec.listener.protocol_port).toBeNull();
         expect(model.spec.listener.connection_limit).toBe(-1);
       });
 
@@ -1007,33 +1007,33 @@
         expect(model.spec.pool.name).toBe('Pool 1');
         expect(model.spec.pool.description).toBe('pool description');
         expect(model.spec.pool.protocol).toBe('HTTP');
-        expect(model.spec.pool.method).toBe('ROUND_ROBIN');
-        expect(model.spec.pool.type).toBe('APP_COOKIE');
-        expect(model.spec.pool.cookie).toBe('cookie_name');
+        expect(model.spec.pool.lb_algorithm).toBe('ROUND_ROBIN');
+        expect(model.spec.pool.session_persistence.type).toBe('APP_COOKIE');
+        expect(model.spec.pool.session_persistence.cookie_name).toBe('cookie_name');
       });
 
       it('should initialize all monitor properties', function() {
         expect(model.spec.monitor.id).toBe('1234');
         expect(model.spec.monitor.type).toBe('HTTP');
-        expect(model.spec.monitor.interval).toBe(1);
-        expect(model.spec.monitor.retry).toBe(1);
-        expect(model.spec.monitor.retry_down).toBe(1);
+        expect(model.spec.monitor.delay).toBe(1);
+        expect(model.spec.monitor.max_retries).toBe(1);
+        expect(model.spec.monitor.max_retries_down).toBe(1);
         expect(model.spec.monitor.timeout).toBe(1);
-        expect(model.spec.monitor.method).toBe('POST');
-        expect(model.spec.monitor.status).toBe('200');
-        expect(model.spec.monitor.path).toBe('/test');
+        expect(model.spec.monitor.http_method).toBe('POST');
+        expect(model.spec.monitor.expected_codes).toBe('200');
+        expect(model.spec.monitor.url_path).toBe('/test');
       });
 
       it('should initialize members and properties', function() {
         expect(model.spec.members[0].id).toBe('1234');
         expect(model.spec.members[0].address).toBe('1.2.3.4');
-        expect(model.spec.members[0].subnet).toEqual({ id: 'subnet-1', name: 'subnet-1' });
-        expect(model.spec.members[0].port).toBe(80);
+        expect(model.spec.members[0].subnet_id).toEqual({ id: 'subnet-1', name: 'subnet-1' });
+        expect(model.spec.members[0].protocol_port).toBe(80);
         expect(model.spec.members[0].weight).toBe(1);
         expect(model.spec.members[1].id).toBe('5678');
         expect(model.spec.members[1].address).toBe('5.6.7.8');
-        expect(model.spec.members[1].subnet).toEqual({ id: 'subnet-1', name: 'subnet-1' });
-        expect(model.spec.members[1].port).toBe(80);
+        expect(model.spec.members[1].subnet_id).toEqual({ id: 'subnet-1', name: 'subnet-1' });
+        expect(model.spec.members[1].protocol_port).toBe(80);
         expect(model.spec.members[1].weight).toBe(1);
       });
 
@@ -1073,16 +1073,16 @@
       it('should initialize all loadbalancer properties to null', function() {
         expect(model.spec.loadbalancer.name).toBeNull();
         expect(model.spec.loadbalancer.description).toBeNull();
-        expect(model.spec.loadbalancer.ip).toBeNull();
-        expect(model.spec.loadbalancer.subnet).toBeNull();
+        expect(model.spec.loadbalancer.vip_address).toBeNull();
+        expect(model.spec.loadbalancer.vip_subnet_id).toBeNull();
       });
 
       it('should initialize all listener properties to null', function() {
         expect(model.spec.listener.id).toBeNull();
-        expect(model.spec.listener.name).toBe('Listener 1');
+        expect(model.spec.listener.name).toBeNull();
         expect(model.spec.listener.description).toBeNull();
         expect(model.spec.listener.protocol).toBeNull();
-        expect(model.spec.listener.port).toBeNull();
+        expect(model.spec.listener.protocol_port).toBeNull();
         expect(model.spec.listener.connection_limit).toBe(-1);
       });
 
@@ -1091,33 +1091,33 @@
         expect(model.spec.pool.name).toBe('Pool 1');
         expect(model.spec.pool.description).toBe('pool description');
         expect(model.spec.pool.protocol).toBe('HTTP');
-        expect(model.spec.pool.method).toBe('ROUND_ROBIN');
-        expect(model.spec.pool.type).toBe('APP_COOKIE');
-        expect(model.spec.pool.cookie).toBe('cookie_name');
+        expect(model.spec.pool.lb_algorithm).toBe('ROUND_ROBIN');
+        expect(model.spec.pool.session_persistence.type).toBe('APP_COOKIE');
+        expect(model.spec.pool.session_persistence.cookie_name).toBe('cookie_name');
       });
 
       it('should initialize all monitor properties to null', function() {
         expect(model.spec.monitor.id).toBeNull();
         expect(model.spec.monitor.type).toBeNull();
-        expect(model.spec.monitor.interval).toBe(5);
-        expect(model.spec.monitor.retry).toBe(3);
-        expect(model.spec.monitor.retry_down).toBe(3);
+        expect(model.spec.monitor.delay).toBe(5);
+        expect(model.spec.monitor.max_retries).toBe(3);
+        expect(model.spec.monitor.max_retries_down).toBe(3);
         expect(model.spec.monitor.timeout).toBe(5);
-        expect(model.spec.monitor.method).toBe('GET');
-        expect(model.spec.monitor.status).toBe('200');
-        expect(model.spec.monitor.path).toBe('/');
+        expect(model.spec.monitor.http_method).toBe('GET');
+        expect(model.spec.monitor.expected_codes).toBe('200');
+        expect(model.spec.monitor.url_path).toBe('/');
       });
 
       it('should initialize members and properties', function() {
         expect(model.spec.members[0].id).toBe('1234');
         expect(model.spec.members[0].address).toBe('1.2.3.4');
-        expect(model.spec.members[0].subnet).toEqual({ id: 'subnet-1', name: 'subnet-1' });
-        expect(model.spec.members[0].port).toBe(80);
+        expect(model.spec.members[0].subnet_id).toEqual({ id: 'subnet-1', name: 'subnet-1' });
+        expect(model.spec.members[0].protocol_port).toBe(80);
         expect(model.spec.members[0].weight).toBe(1);
         expect(model.spec.members[1].id).toBe('5678');
         expect(model.spec.members[1].address).toBe('5.6.7.8');
-        expect(model.spec.members[1].subnet).toEqual({ id: 'subnet-1', name: 'subnet-1' });
-        expect(model.spec.members[1].port).toBe(80);
+        expect(model.spec.members[1].subnet_id).toEqual({ id: 'subnet-1', name: 'subnet-1' });
+        expect(model.spec.members[1].protocol_port).toBe(80);
         expect(model.spec.members[1].weight).toBe(1);
       });
 
@@ -1173,11 +1173,11 @@
       it('has the right number of properties', function() {
         expect(Object.keys(model.spec).length).toBe(11);
         expect(Object.keys(model.spec.loadbalancer).length).toBe(5);
-        expect(Object.keys(model.spec.listener).length).toBe(8);
+        expect(Object.keys(model.spec.listener).length).toBe(9);
         expect(Object.keys(model.spec.l7policy).length).toBe(8);
         expect(Object.keys(model.spec.l7rule).length).toBe(7);
-        expect(Object.keys(model.spec.pool).length).toBe(8);
-        expect(Object.keys(model.spec.monitor).length).toBe(10);
+        expect(Object.keys(model.spec.pool).length).toBe(7);
+        expect(Object.keys(model.spec.monitor).length).toBe(11);
         expect(model.spec.members).toEqual([]);
       });
 
@@ -1198,11 +1198,11 @@
       });
 
       it('sets load balancer ip address to null', function() {
-        expect(model.spec.loadbalancer.ip).toBeNull();
+        expect(model.spec.loadbalancer.vip_address).toBeNull();
       });
 
       it('sets load balancer subnet to null', function() {
-        expect(model.spec.loadbalancer.subnet).toBeNull();
+        expect(model.spec.loadbalancer.vip_subnet_id).toBeNull();
       });
 
       it('sets listener id to null', function() {
@@ -1210,7 +1210,7 @@
       });
 
       it('sets listener name to reasonable default', function() {
-        expect(model.spec.listener.name).toBe('Listener 1');
+        expect(model.spec.listener.name).toBeNull();
       });
 
       it('sets listener description to null', function() {
@@ -1221,8 +1221,8 @@
         expect(model.spec.listener.protocol).toBeNull();
       });
 
-      it('sets listener port to null', function() {
-        expect(model.spec.listener.port).toBeNull();
+      it('sets listener protocol_port to null', function() {
+        expect(model.spec.listener.protocol_port).toBeNull();
       });
 
       it('sets listener connection limit to reasonable default', function() {
@@ -1234,7 +1234,7 @@
       });
 
       it('sets pool name to reasonable default', function() {
-        expect(model.spec.pool.name).toBe('Pool 1');
+        expect(model.spec.pool.name).toBeNull();
       });
 
       it('sets pool description to null', function() {
@@ -1245,8 +1245,8 @@
         expect(model.spec.pool.protocol).toBeNull();
       });
 
-      it('sets pool method to null', function() {
-        expect(model.spec.pool.method).toBeNull();
+      it('sets pool lb_algorithm to null', function() {
+        expect(model.spec.pool.lb_algorithm).toBeNull();
       });
 
       it('sets monitor id to null', function() {
@@ -1257,32 +1257,32 @@
         expect(model.spec.monitor.type).toBeNull();
       });
 
-      it('sets monitor interval to 5', function() {
-        expect(model.spec.monitor.interval).toBe(5);
+      it('sets monitor delay to 5', function() {
+        expect(model.spec.monitor.delay).toBe(5);
       });
 
-      it('sets monitor retry count to 3', function() {
-        expect(model.spec.monitor.retry).toBe(3);
+      it('sets monitor max_retries count to 3', function() {
+        expect(model.spec.monitor.max_retries).toBe(3);
       });
 
-      it('sets monitor retry down count to 3', function() {
-        expect(model.spec.monitor.retry_down).toBe(3);
+      it('sets monitor max_retries down count to 3', function() {
+        expect(model.spec.monitor.max_retries_down).toBe(3);
       });
 
       it('sets monitor timeout to 5', function() {
         expect(model.spec.monitor.timeout).toBe(5);
       });
 
-      it('sets monitor method to default', function() {
-        expect(model.spec.monitor.method).toBe('GET');
+      it('sets monitor http_method to default', function() {
+        expect(model.spec.monitor.http_method).toBe('GET');
       });
 
-      it('sets monitor status code to default', function() {
-        expect(model.spec.monitor.status).toBe('200');
+      it('sets monitor expected_codes code to default', function() {
+        expect(model.spec.monitor.expected_codes).toBe('200');
       });
 
       it('sets monitor URL path to default', function() {
-        expect(model.spec.monitor.path).toBe('/');
+        expect(model.spec.monitor.url_path).toBe('/');
       });
     });
 
@@ -1305,7 +1305,7 @@
       it('should fail to be initialized on subnets error', function() {
         expect(model.initializing).toBe(false);
         expect(model.initialized).toBe(false);
-        expect(model.spec.loadbalancer.name).toBe('Load Balancer 4');
+        expect(model.spec.loadbalancer.name).toBeNull();
         expect(model.subnets).toEqual([]);
       });
     });
@@ -1418,46 +1418,46 @@
       });
 
       it('should set final spec properties', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'TCP';
-        model.spec.listener.port = 80;
+        model.spec.listener.protocol_port = 80;
         model.spec.listener.connection_limit = 999;
         model.spec.pool.name = 'pool name';
         model.spec.pool.description = 'pool description';
-        model.spec.pool.method = 'LEAST_CONNECTIONS';
-        model.spec.pool.type = 'SOURCE_IP';
+        model.spec.pool.lb_algorithm = 'LEAST_CONNECTIONS';
+        model.spec.pool.session_persistence.type = 'SOURCE_IP';
         model.spec.members = [{
           address: { ip: '1.2.3.4', subnet: '1' },
           addresses: [{ ip: '1.2.3.4', subnet: '1' },
                       { ip: '2.3.4.5', subnet: '2' }],
           id: '1',
           name: 'foo',
-          port: 80,
+          protocol_port: 80,
           weight: 1
         }, {
           id: 'external-member-0',
           address: '2.3.4.5',
-          subnet: null,
-          port: 80,
+          subnet_id: null,
+          protocol_port: 80,
           weight: 1
         }, {
           id: 'external-member-1',
           address: null,
-          subnet: null,
-          port: 80,
+          subnet_id: null,
+          protocol_port: 80,
           weight: 1
         }, {
           id: 'external-member-2',
           address: '3.4.5.6',
-          subnet: { id: '1' },
-          port: 80,
+          subnet_id: { id: '1' },
+          protocol_port: 80,
           weight: 1
         }];
         model.spec.monitor.type = 'PING';
-        model.spec.monitor.interval = 1;
-        model.spec.monitor.retry = 1;
-        model.spec.monitor.retry_down = 1;
+        model.spec.monitor.delay = 1;
+        model.spec.monitor.max_retries = 1;
+        model.spec.monitor.max_retries_down = 1;
         model.spec.monitor.timeout = 1;
         model.spec.certificates = [{
           id: 'container1',
@@ -1467,30 +1467,30 @@
 
         var finalSpec = model.submit();
 
-        expect(finalSpec.loadbalancer.name).toBe('Load Balancer 4');
+        expect(finalSpec.loadbalancer.name).toBeUndefined();
         expect(finalSpec.loadbalancer.description).toBeUndefined();
-        expect(finalSpec.loadbalancer.ip).toBe('1.2.3.4');
-        expect(finalSpec.loadbalancer.subnet).toBe(model.subnets[0].id);
+        expect(finalSpec.loadbalancer.vip_address).toBe('1.2.3.4');
+        expect(finalSpec.loadbalancer.vip_subnet_id).toBe(model.subnets[0].id);
         expect(finalSpec.loadbalancer.admin_state_up).toBe(true);
 
-        expect(finalSpec.listener.name).toBe('Listener 1');
+        expect(finalSpec.listener.name).toBeUndefined();
         expect(finalSpec.listener.description).toBeUndefined();
         expect(finalSpec.listener.protocol).toBe('TCP');
-        expect(finalSpec.listener.port).toBe(80);
+        expect(finalSpec.listener.protocol_port).toBe(80);
         expect(finalSpec.listener.connection_limit).toBe(999);
         expect(finalSpec.listener.admin_state_up).toBe(true);
 
         expect(finalSpec.pool.name).toBe('pool name');
         expect(finalSpec.pool.description).toBe('pool description');
         expect(finalSpec.pool.protocol).toBe('TCP');
-        expect(finalSpec.pool.method).toBe('LEAST_CONNECTIONS');
-        expect(finalSpec.pool.type).toBe('SOURCE_IP');
+        expect(finalSpec.pool.lb_algorithm).toBe('LEAST_CONNECTIONS');
+        expect(finalSpec.pool.session_persistence.type).toBe('SOURCE_IP');
         expect(finalSpec.pool.admin_state_up).toBe(true);
 
         expect(finalSpec.members.length).toBe(3);
         expect(finalSpec.members[0].address).toBe('1.2.3.4');
-        expect(finalSpec.members[0].subnet).toBe('1');
-        expect(finalSpec.members[0].port).toBe(80);
+        expect(finalSpec.members[0].subnet_id).toBe('1');
+        expect(finalSpec.members[0].protocol_port).toBe(80);
         expect(finalSpec.members[0].weight).toBe(1);
         expect(finalSpec.members[0].id).toBe('1');
         expect(finalSpec.members[0].addresses).toBeUndefined();
@@ -1498,33 +1498,33 @@
         expect(finalSpec.members[0].allocatedMember).toBeUndefined();
         expect(finalSpec.members[1].id).toBe('external-member-0');
         expect(finalSpec.members[1].address).toBe('2.3.4.5');
-        expect(finalSpec.members[1].subnet).toBeUndefined();
-        expect(finalSpec.members[1].port).toBe(80);
+        expect(finalSpec.members[1].subnet_id).toBeUndefined();
+        expect(finalSpec.members[1].protocol_port).toBe(80);
         expect(finalSpec.members[1].weight).toBe(1);
         expect(finalSpec.members[1].allocatedMember).toBeUndefined();
         expect(finalSpec.members[2].id).toBe('external-member-2');
         expect(finalSpec.members[2].address).toBe('3.4.5.6');
-        expect(finalSpec.members[2].subnet).toBe('1');
-        expect(finalSpec.members[2].port).toBe(80);
+        expect(finalSpec.members[2].subnet_id).toBe('1');
+        expect(finalSpec.members[2].protocol_port).toBe(80);
         expect(finalSpec.members[2].weight).toBe(1);
         expect(finalSpec.members[2].allocatedMember).toBeUndefined();
 
         expect(finalSpec.monitor.type).toBe('PING');
-        expect(finalSpec.monitor.interval).toBe(1);
-        expect(finalSpec.monitor.retry).toBe(1);
-        expect(finalSpec.monitor.retry_down).toBe(1);
+        expect(finalSpec.monitor.delay).toBe(1);
+        expect(finalSpec.monitor.max_retries).toBe(1);
+        expect(finalSpec.monitor.max_retries_down).toBe(1);
         expect(finalSpec.monitor.timeout).toBe(1);
         expect(finalSpec.certificates).toBeUndefined();
         expect(finalSpec.monitor.admin_state_up).toBe(true);
       });
 
       it('should set final spec certificates', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'TERMINATED_HTTPS';
-        model.spec.listener.port = 443;
+        model.spec.listener.protocol_port = 443;
         model.spec.listener.connection_limit = 9999;
-        model.spec.pool.method = 'LEAST_CONNECTIONS';
+        model.spec.pool.lb_algorithm = 'LEAST_CONNECTIONS';
         model.spec.certificates = [{
           id: 'container1',
           name: 'foo',
@@ -1533,21 +1533,21 @@
 
         var finalSpec = model.submit();
 
-        expect(finalSpec.loadbalancer.name).toBe('Load Balancer 4');
+        expect(finalSpec.loadbalancer.name).toBeUndefined();
         expect(finalSpec.loadbalancer.description).toBeUndefined();
-        expect(finalSpec.loadbalancer.ip).toBe('1.2.3.4');
-        expect(finalSpec.loadbalancer.subnet).toBe(model.subnets[0].id);
-        expect(finalSpec.listener.name).toBe('Listener 1');
+        expect(finalSpec.loadbalancer.vip_address).toBe('1.2.3.4');
+        expect(finalSpec.loadbalancer.vip_subnet_id).toBe(model.subnets[0].id);
+        expect(finalSpec.listener.name).toBeUndefined();
         expect(finalSpec.listener.description).toBeUndefined();
         expect(finalSpec.listener.protocol).toBe('TERMINATED_HTTPS');
-        expect(finalSpec.listener.port).toBe(443);
+        expect(finalSpec.listener.protocol_port).toBe(443);
         expect(finalSpec.listener.connection_limit).toBe(9999);
         expect(finalSpec.pool.protocol).toBe('HTTP');
         expect(finalSpec.certificates).toEqual(['container1']);
       });
 
       it('should delete load balancer if any required property is not set', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
 
         var finalSpec = model.submit();
 
@@ -1555,8 +1555,8 @@
       });
 
       it('should delete listener if any required property is not set', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
 
         var finalSpec = model.submit();
@@ -1567,10 +1567,10 @@
       });
 
       it('should delete certificates if not using TERMINATED_HTTPS', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
-        model.spec.listener.port = 80;
+        model.spec.listener.protocol_port = 80;
         model.spec.certificates = [{id: '1'}];
 
         var finalSpec = model.submit();
@@ -1581,10 +1581,10 @@
       });
 
       it('should delete pool if any required property is not set', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
-        model.spec.listener.port = 80;
+        model.spec.listener.protocol_port = 80;
 
         var finalSpec = model.submit();
 
@@ -1594,11 +1594,11 @@
       });
 
       it('should delete members if none selected', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
-        model.spec.listener.port = 80;
-        model.spec.pool.method = 'LEAST_CONNECTIONS';
+        model.spec.listener.protocol_port = 80;
+        model.spec.pool.lb_algorithm = 'LEAST_CONNECTIONS';
 
         var finalSpec = model.submit();
 
@@ -1609,11 +1609,11 @@
       });
 
       it('should delete members if no members are valid', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
-        model.spec.listener.port = 80;
-        model.spec.pool.method = 'LEAST_CONNECTIONS';
+        model.spec.listener.protocol_port = 80;
+        model.spec.pool.lb_algorithm = 'LEAST_CONNECTIONS';
         model.spec.members = [{
           id: 'foo',
           address: '2.3.4.5',
@@ -1629,15 +1629,15 @@
       });
 
       it('should delete monitor if any required property not set', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
-        model.spec.listener.port = 80;
-        model.spec.pool.method = 'LEAST_CONNECTIONS';
+        model.spec.listener.protocol_port = 80;
+        model.spec.pool.lb_algorithm = 'LEAST_CONNECTIONS';
         model.spec.monitor.type = 'PING';
-        model.spec.monitor.interval = 1;
-        model.spec.monitor.retry = 1;
-        model.spec.monitor.retry_down = 1;
+        model.spec.monitor.delay = 1;
+        model.spec.monitor.max_retries = 1;
+        model.spec.monitor.max_retries_down = 1;
         model.spec.monitor.timeout = null;
 
         var finalSpec = model.submit();
@@ -1664,8 +1664,8 @@
 
         expect(finalSpec.loadbalancer.name).toBe('Load Balancer 1');
         expect(finalSpec.loadbalancer.description).toBe('new description');
-        expect(finalSpec.loadbalancer.ip).toBe('1.2.3.4');
-        expect(finalSpec.loadbalancer.subnet).toBe('subnet-1');
+        expect(finalSpec.loadbalancer.vip_address).toBe('1.2.3.4');
+        expect(finalSpec.loadbalancer.vip_subnet_id).toBe('subnet-1');
       });
     });
 
@@ -1678,42 +1678,42 @@
 
       it('should set final spec properties', function() {
         model.spec.listener.protocol = 'TCP';
-        model.spec.listener.port = 80;
+        model.spec.listener.protocol_port = 80;
         model.spec.listener.connection_limit = 999;
         model.spec.pool.name = 'pool name';
         model.spec.pool.description = 'pool description';
-        model.spec.pool.method = 'LEAST_CONNECTIONS';
+        model.spec.pool.lb_algorithm = 'LEAST_CONNECTIONS';
         model.spec.members = [{
           address: { ip: '1.2.3.4', subnet: '1' },
           addresses: [{ ip: '1.2.3.4', subnet: '1' },
                       { ip: '2.3.4.5', subnet: '2' }],
           id: '1',
           name: 'foo',
-          port: 80,
+          protocol_port: 80,
           weight: 1
         }, {
           id: 'external-member-0',
           address: '2.3.4.5',
-          subnet: null,
-          port: 80,
+          subnet_id: null,
+          protocol_port: 80,
           weight: 1
         }, {
           id: 'external-member-1',
           address: null,
-          subnet: null,
-          port: 80,
+          subnet_id: null,
+          protocol_port: 80,
           weight: 1
         }, {
           id: 'external-member-2',
           address: '3.4.5.6',
-          subnet: { id: '1' },
-          port: 80,
+          subnet_id: { id: '1' },
+          protocol_port: 80,
           weight: 1
         }];
         model.spec.monitor.type = 'PING';
-        model.spec.monitor.interval = 1;
-        model.spec.monitor.retry = 1;
-        model.spec.monitor.retry_down = 1;
+        model.spec.monitor.delay = 1;
+        model.spec.monitor.max_retries = 1;
+        model.spec.monitor.max_retries_down = 1;
         model.spec.monitor.timeout = 1;
         model.spec.certificates = [{
           id: 'container1',
@@ -1723,21 +1723,21 @@
 
         var finalSpec = model.submit();
 
-        expect(finalSpec.listener.name).toBe('Listener 4');
+        expect(finalSpec.listener.name).toBeUndefined();
         expect(finalSpec.listener.description).toBeUndefined();
         expect(finalSpec.listener.protocol).toBe('TCP');
-        expect(finalSpec.listener.port).toBe(80);
+        expect(finalSpec.listener.protocol_port).toBe(80);
         expect(finalSpec.listener.connection_limit).toBe(999);
 
         expect(finalSpec.pool.name).toBe('pool name');
         expect(finalSpec.pool.description).toBe('pool description');
         expect(finalSpec.pool.protocol).toBe('TCP');
-        expect(finalSpec.pool.method).toBe('LEAST_CONNECTIONS');
+        expect(finalSpec.pool.lb_algorithm).toBe('LEAST_CONNECTIONS');
 
         expect(finalSpec.members.length).toBe(3);
         expect(finalSpec.members[0].address).toBe('1.2.3.4');
-        expect(finalSpec.members[0].subnet).toBe('1');
-        expect(finalSpec.members[0].port).toBe(80);
+        expect(finalSpec.members[0].subnet_id).toBe('1');
+        expect(finalSpec.members[0].protocol_port).toBe(80);
         expect(finalSpec.members[0].weight).toBe(1);
         expect(finalSpec.members[0].id).toBe('1');
         expect(finalSpec.members[0].addresses).toBeUndefined();
@@ -1745,32 +1745,32 @@
         expect(finalSpec.members[0].allocatedMember).toBeUndefined();
         expect(finalSpec.members[1].id).toBe('external-member-0');
         expect(finalSpec.members[1].address).toBe('2.3.4.5');
-        expect(finalSpec.members[1].subnet).toBeUndefined();
-        expect(finalSpec.members[1].port).toBe(80);
+        expect(finalSpec.members[1].subnet_id).toBeUndefined();
+        expect(finalSpec.members[1].protocol_port).toBe(80);
         expect(finalSpec.members[1].weight).toBe(1);
         expect(finalSpec.members[1].allocatedMember).toBeUndefined();
         expect(finalSpec.members[2].id).toBe('external-member-2');
         expect(finalSpec.members[2].address).toBe('3.4.5.6');
-        expect(finalSpec.members[2].subnet).toBe('1');
-        expect(finalSpec.members[2].port).toBe(80);
+        expect(finalSpec.members[2].subnet_id).toBe('1');
+        expect(finalSpec.members[2].protocol_port).toBe(80);
         expect(finalSpec.members[2].weight).toBe(1);
         expect(finalSpec.members[2].allocatedMember).toBeUndefined();
 
         expect(finalSpec.monitor.type).toBe('PING');
-        expect(finalSpec.monitor.interval).toBe(1);
-        expect(finalSpec.monitor.retry).toBe(1);
-        expect(finalSpec.monitor.retry_down).toBe(1);
+        expect(finalSpec.monitor.delay).toBe(1);
+        expect(finalSpec.monitor.max_retries).toBe(1);
+        expect(finalSpec.monitor.max_retries_down).toBe(1);
         expect(finalSpec.monitor.timeout).toBe(1);
         expect(finalSpec.certificates).toBeUndefined();
       });
 
       it('should set final spec certificates', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'TERMINATED_HTTPS';
-        model.spec.listener.port = 443;
+        model.spec.listener.protocol_port = 443;
         model.spec.listener.connection_limit = 999;
-        model.spec.pool.method = 'LEAST_CONNECTIONS';
+        model.spec.pool.lb_algorithm = 'LEAST_CONNECTIONS';
         model.spec.certificates = [{
           id: 'container1',
           name: 'foo',
@@ -1779,18 +1779,18 @@
 
         var finalSpec = model.submit();
 
-        expect(finalSpec.listener.name).toBe('Listener 4');
+        expect(finalSpec.listener.name).toBeUndefined();
         expect(finalSpec.listener.description).toBeUndefined();
         expect(finalSpec.listener.protocol).toBe('TERMINATED_HTTPS');
-        expect(finalSpec.listener.port).toBe(443);
+        expect(finalSpec.listener.protocol_port).toBe(443);
         expect(finalSpec.listener.connection_limit).toBe(999);
         expect(finalSpec.pool.protocol).toBe('HTTP');
         expect(finalSpec.certificates).toEqual(['container1']);
       });
 
       it('should delete listener if any required property is not set', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
 
         var finalSpec = model.submit();
@@ -1801,10 +1801,10 @@
       });
 
       it('should delete certificates if not using TERMINATED_HTTPS', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
-        model.spec.listener.port = 80;
+        model.spec.listener.protocol_port = 80;
         model.spec.certificates = [{id: '1'}];
 
         var finalSpec = model.submit();
@@ -1815,10 +1815,10 @@
       });
 
       it('should delete pool if any required property is not set', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
-        model.spec.listener.port = 80;
+        model.spec.listener.protocol_port = 80;
 
         var finalSpec = model.submit();
 
@@ -1828,11 +1828,11 @@
       });
 
       it('should delete members if none selected', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
-        model.spec.listener.port = 80;
-        model.spec.pool.method = 'LEAST_CONNECTIONS';
+        model.spec.listener.protocol_port = 80;
+        model.spec.pool.lb_algorithm = 'LEAST_CONNECTIONS';
 
         var finalSpec = model.submit();
 
@@ -1843,11 +1843,11 @@
       });
 
       it('should delete members if no members are valid', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
-        model.spec.listener.port = 80;
-        model.spec.pool.method = 'LEAST_CONNECTIONS';
+        model.spec.listener.protocol_port = 80;
+        model.spec.pool.lb_algorithm = 'LEAST_CONNECTIONS';
         model.spec.members = [{
           id: 'foo',
           address: '2.3.4.5',
@@ -1863,15 +1863,15 @@
       });
 
       it('should delete monitor if any required property not set', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
-        model.spec.listener.port = 80;
-        model.spec.pool.method = 'LEAST_CONNECTIONS';
+        model.spec.listener.protocol_port = 80;
+        model.spec.pool.lb_algorithm = 'LEAST_CONNECTIONS';
         model.spec.monitor.type = 'PING';
-        model.spec.monitor.interval = 1;
-        model.spec.monitor.retry = 1;
-        model.spec.monitor.retry_down = 1;
+        model.spec.monitor.delay = 1;
+        model.spec.monitor.max_retries = 1;
+        model.spec.monitor.max_retries_down = 1;
         model.spec.monitor.timeout = null;
 
         var finalSpec = model.submit();
@@ -1937,38 +1937,38 @@
         model.spec.listener.protocol = 'TCP';
         model.spec.pool.name = 'pool name';
         model.spec.pool.description = 'pool description';
-        model.spec.pool.method = 'LEAST_CONNECTIONS';
+        model.spec.pool.lb_algorithm = 'LEAST_CONNECTIONS';
         model.spec.members = [{
           address: { ip: '1.2.3.4', subnet: '1' },
           addresses: [{ ip: '1.2.3.4', subnet: '1' },
                       { ip: '2.3.4.5', subnet: '2' }],
           id: '1',
           name: 'foo',
-          port: 80,
+          protocol_port: 80,
           weight: 1
         }, {
           id: 'external-member-0',
           address: '2.3.4.5',
-          subnet: null,
-          port: 80,
+          subnet_id: null,
+          protocol_port: 80,
           weight: 1
         }, {
           id: 'external-member-1',
           address: null,
-          subnet: null,
-          port: 80,
+          subnet_id: null,
+          protocol_port: 80,
           weight: 1
         }, {
           id: 'external-member-2',
           address: '3.4.5.6',
-          subnet: { id: '1' },
-          port: 80,
+          subnet_id: { id: '1' },
+          protocol_port: 80,
           weight: 1
         }];
         model.spec.monitor.type = 'PING';
-        model.spec.monitor.interval = 1;
-        model.spec.monitor.retry = 1;
-        model.spec.monitor.retry_down = 1;
+        model.spec.monitor.delay = 1;
+        model.spec.monitor.max_retries = 1;
+        model.spec.monitor.max_retries_down = 1;
         model.spec.monitor.timeout = 1;
         model.spec.certificates = [{
           id: 'container1',
@@ -1981,12 +1981,12 @@
         expect(finalSpec.pool.name).toBe('pool name');
         expect(finalSpec.pool.description).toBe('pool description');
         expect(finalSpec.pool.protocol).toBe('TCP');
-        expect(finalSpec.pool.method).toBe('LEAST_CONNECTIONS');
+        expect(finalSpec.pool.lb_algorithm).toBe('LEAST_CONNECTIONS');
 
         expect(finalSpec.members.length).toBe(3);
         expect(finalSpec.members[0].address).toBe('1.2.3.4');
-        expect(finalSpec.members[0].subnet).toBe('1');
-        expect(finalSpec.members[0].port).toBe(80);
+        expect(finalSpec.members[0].subnet_id).toBe('1');
+        expect(finalSpec.members[0].protocol_port).toBe(80);
         expect(finalSpec.members[0].weight).toBe(1);
         expect(finalSpec.members[0].id).toBe('1');
         expect(finalSpec.members[0].addresses).toBeUndefined();
@@ -1994,30 +1994,30 @@
         expect(finalSpec.members[0].allocatedMember).toBeUndefined();
         expect(finalSpec.members[1].id).toBe('external-member-0');
         expect(finalSpec.members[1].address).toBe('2.3.4.5');
-        expect(finalSpec.members[1].subnet).toBeUndefined();
-        expect(finalSpec.members[1].port).toBe(80);
+        expect(finalSpec.members[1].subnet_id).toBeUndefined();
+        expect(finalSpec.members[1].protocol_port).toBe(80);
         expect(finalSpec.members[1].weight).toBe(1);
         expect(finalSpec.members[1].allocatedMember).toBeUndefined();
         expect(finalSpec.members[2].id).toBe('external-member-2');
         expect(finalSpec.members[2].address).toBe('3.4.5.6');
-        expect(finalSpec.members[2].subnet).toBe('1');
-        expect(finalSpec.members[2].port).toBe(80);
+        expect(finalSpec.members[2].subnet_id).toBe('1');
+        expect(finalSpec.members[2].protocol_port).toBe(80);
         expect(finalSpec.members[2].weight).toBe(1);
         expect(finalSpec.members[2].allocatedMember).toBeUndefined();
 
         expect(finalSpec.monitor.type).toBe('PING');
-        expect(finalSpec.monitor.interval).toBe(1);
-        expect(finalSpec.monitor.retry).toBe(1);
-        expect(finalSpec.monitor.retry_down).toBe(1);
+        expect(finalSpec.monitor.delay).toBe(1);
+        expect(finalSpec.monitor.max_retries).toBe(1);
+        expect(finalSpec.monitor.max_retries_down).toBe(1);
         expect(finalSpec.monitor.timeout).toBe(1);
         expect(finalSpec.certificates).toBeUndefined();
       });
 
       it('should delete listener if any required property is not set', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
-        model.spec.listener.port = '';
+        model.spec.listener.protocol_port = '';
 
         var finalSpec = model.submit();
 
@@ -2027,10 +2027,10 @@
       });
 
       it('should delete certificates if not using TERMINATED_HTTPS', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
-        model.spec.listener.port = 80;
+        model.spec.listener.protocol_port = 80;
         model.spec.certificates = [{id: '1'}];
 
         var finalSpec = model.submit();
@@ -2041,10 +2041,10 @@
       });
 
       it('should delete pool if any required property is not set', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
-        model.spec.listener.port = 80;
+        model.spec.listener.protocol_port = 80;
 
         var finalSpec = model.submit();
 
@@ -2054,11 +2054,11 @@
       });
 
       it('should delete members if none selected', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
-        model.spec.listener.port = 80;
-        model.spec.pool.method = 'LEAST_CONNECTIONS';
+        model.spec.listener.protocol_port = 80;
+        model.spec.pool.lb_algorithm = 'LEAST_CONNECTIONS';
 
         var finalSpec = model.submit();
 
@@ -2069,11 +2069,11 @@
       });
 
       it('should delete members if no members are valid', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
-        model.spec.listener.port = 80;
-        model.spec.pool.method = 'LEAST_CONNECTIONS';
+        model.spec.listener.protocol_port = 80;
+        model.spec.pool.lb_algorithm = 'LEAST_CONNECTIONS';
         model.spec.members = [{
           id: 'foo',
           address: '2.3.4.5',
@@ -2089,15 +2089,15 @@
       });
 
       it('should delete monitor if any required property not set', function() {
-        model.spec.loadbalancer.ip = '1.2.3.4';
-        model.spec.loadbalancer.subnet = model.subnets[0];
+        model.spec.loadbalancer.vip_address = '1.2.3.4';
+        model.spec.loadbalancer.vip_subnet_id = model.subnets[0];
         model.spec.listener.protocol = 'HTTP';
-        model.spec.listener.port = 80;
-        model.spec.pool.method = 'LEAST_CONNECTIONS';
+        model.spec.listener.protocol_port = 80;
+        model.spec.pool.lb_algorithm = 'LEAST_CONNECTIONS';
         model.spec.monitor.type = 'PING';
-        model.spec.monitor.interval = 1;
-        model.spec.monitor.retry = 1;
-        model.spec.monitor.retry_down = 1;
+        model.spec.monitor.delay = 1;
+        model.spec.monitor.max_retries = 1;
+        model.spec.monitor.max_retries_down = 1;
         model.spec.monitor.timeout = null;
 
         var finalSpec = model.submit();
@@ -2131,13 +2131,13 @@
         expect(finalSpec.certificates).toBeUndefined();
 
         expect(finalSpec.monitor.type).toBe('HTTP');
-        expect(finalSpec.monitor.interval).toBe(5);
-        expect(finalSpec.monitor.retry).toBe(3);
-        expect(finalSpec.monitor.retry_down).toBe(3);
+        expect(finalSpec.monitor.delay).toBe(5);
+        expect(finalSpec.monitor.max_retries).toBe(3);
+        expect(finalSpec.monitor.max_retries_down).toBe(3);
         expect(finalSpec.monitor.timeout).toBe(5);
-        expect(finalSpec.monitor.method).toBe('GET');
-        expect(finalSpec.monitor.status).toBe('200');
-        expect(finalSpec.monitor.path).toBe('/');
+        expect(finalSpec.monitor.http_method).toBe('GET');
+        expect(finalSpec.monitor.expected_codes).toBe('200');
+        expect(finalSpec.monitor.url_path).toBe('/');
       });
     });
 
@@ -2157,31 +2157,31 @@
         expect(finalSpec.listener.name).toBe('Listener 1');
         expect(finalSpec.listener.description).toBe('listener description');
         expect(finalSpec.listener.protocol).toBe('HTTP');
-        expect(finalSpec.listener.port).toBe(80);
+        expect(finalSpec.listener.protocol_port).toBe(80);
 
         expect(finalSpec.pool.name).toBe('Pool 1');
         expect(finalSpec.pool.description).toBe('pool description');
         expect(finalSpec.pool.protocol).toBe('HTTP');
-        expect(finalSpec.pool.method).toBe('ROUND_ROBIN');
-        expect(finalSpec.pool.type).toBe('APP_COOKIE');
-        expect(finalSpec.pool.cookie).toBe('cookie_name');
+        expect(finalSpec.pool.lb_algorithm).toBe('ROUND_ROBIN');
+        expect(finalSpec.pool.session_persistence.type).toBe('APP_COOKIE');
+        expect(finalSpec.pool.session_persistence.cookie_name).toBe('cookie_name');
 
         expect(finalSpec.members.length).toBe(2);
         expect(finalSpec.members[0].id).toBe('1234');
         expect(finalSpec.members[0].address).toBe('1.2.3.4');
-        expect(finalSpec.members[0].subnet).toBe('subnet-1');
-        expect(finalSpec.members[0].port).toBe(80);
+        expect(finalSpec.members[0].subnet_id).toBe('subnet-1');
+        expect(finalSpec.members[0].protocol_port).toBe(80);
         expect(finalSpec.members[0].weight).toBe(1);
         expect(finalSpec.members[1].id).toBe('5678');
         expect(finalSpec.members[1].address).toBe('5.6.7.8');
-        expect(finalSpec.members[1].subnet).toBe('subnet-1');
-        expect(finalSpec.members[1].port).toBe(80);
+        expect(finalSpec.members[1].subnet_id).toBe('subnet-1');
+        expect(finalSpec.members[1].protocol_port).toBe(80);
         expect(finalSpec.members[1].weight).toBe(1);
 
         expect(finalSpec.monitor.type).toBe('HTTP');
-        expect(finalSpec.monitor.interval).toBe(1);
-        expect(finalSpec.monitor.retry).toBe(1);
-        expect(finalSpec.monitor.retry_down).toBe(1);
+        expect(finalSpec.monitor.delay).toBe(1);
+        expect(finalSpec.monitor.max_retries).toBe(1);
+        expect(finalSpec.monitor.max_retries_down).toBe(1);
         expect(finalSpec.monitor.timeout).toBe(1);
       });
     });
@@ -2243,26 +2243,26 @@
         expect(finalSpec.pool.name).toBe('Pool 1');
         expect(finalSpec.pool.description).toBe('pool description');
         expect(finalSpec.pool.protocol).toBe('HTTP');
-        expect(finalSpec.pool.method).toBe('ROUND_ROBIN');
-        expect(finalSpec.pool.type).toBe('APP_COOKIE');
-        expect(finalSpec.pool.cookie).toBe('cookie_name');
+        expect(finalSpec.pool.lb_algorithm).toBe('ROUND_ROBIN');
+        expect(finalSpec.pool.session_persistence.type).toBe('APP_COOKIE');
+        expect(finalSpec.pool.session_persistence.cookie_name).toBe('cookie_name');
 
         expect(finalSpec.members.length).toBe(2);
         expect(finalSpec.members[0].id).toBe('1234');
         expect(finalSpec.members[0].address).toBe('1.2.3.4');
-        expect(finalSpec.members[0].subnet).toBe('subnet-1');
-        expect(finalSpec.members[0].port).toBe(80);
+        expect(finalSpec.members[0].subnet_id).toBe('subnet-1');
+        expect(finalSpec.members[0].protocol_port).toBe(80);
         expect(finalSpec.members[0].weight).toBe(1);
         expect(finalSpec.members[1].id).toBe('5678');
         expect(finalSpec.members[1].address).toBe('5.6.7.8');
-        expect(finalSpec.members[1].subnet).toBe('subnet-1');
-        expect(finalSpec.members[1].port).toBe(80);
+        expect(finalSpec.members[1].subnet_id).toBe('subnet-1');
+        expect(finalSpec.members[1].protocol_port).toBe(80);
         expect(finalSpec.members[1].weight).toBe(1);
 
         expect(finalSpec.monitor.type).toBe('HTTP');
-        expect(finalSpec.monitor.interval).toBe(1);
-        expect(finalSpec.monitor.retry).toBe(1);
-        expect(finalSpec.monitor.retry_down).toBe(1);
+        expect(finalSpec.monitor.delay).toBe(1);
+        expect(finalSpec.monitor.max_retries).toBe(1);
+        expect(finalSpec.monitor.max_retries_down).toBe(1);
         expect(finalSpec.monitor.timeout).toBe(1);
       });
     });
@@ -2287,25 +2287,25 @@
         expect(finalSpec.pool.name).toBe('Pool 1');
         expect(finalSpec.pool.description).toBe('pool description');
         expect(finalSpec.pool.protocol).toBe('HTTP');
-        expect(finalSpec.pool.method).toBe('ROUND_ROBIN');
-        expect(finalSpec.pool.type).toBe('APP_COOKIE');
-        expect(finalSpec.pool.cookie).toBe('cookie_name');
+        expect(finalSpec.pool.lb_algorithm).toBe('ROUND_ROBIN');
+        expect(finalSpec.pool.session_persistence.type).toBe('APP_COOKIE');
+        expect(finalSpec.pool.session_persistence.cookie_name).toBe('cookie_name');
 
         expect(finalSpec.members.length).toBe(2);
         expect(finalSpec.members[0].id).toBe('1234');
         expect(finalSpec.members[0].address).toBe('1.2.3.4');
-        expect(finalSpec.members[0].subnet).toBe('subnet-1');
-        expect(finalSpec.members[0].port).toBe(80);
+        expect(finalSpec.members[0].subnet_id).toBe('subnet-1');
+        expect(finalSpec.members[0].protocol_port).toBe(80);
         expect(finalSpec.members[0].weight).toBe(1);
         expect(finalSpec.members[1].id).toBe('5678');
         expect(finalSpec.members[1].address).toBe('5.6.7.8');
-        expect(finalSpec.members[1].subnet).toBe('subnet-1');
-        expect(finalSpec.members[1].port).toBe(80);
+        expect(finalSpec.members[1].subnet_id).toBe('subnet-1');
+        expect(finalSpec.members[1].protocol_port).toBe(80);
         expect(finalSpec.members[1].weight).toBe(1);
 
-        expect(finalSpec.monitor.interval).toBe(5);
-        expect(finalSpec.monitor.retry).toBe(3);
-        expect(finalSpec.monitor.retry_down).toBe(3);
+        expect(finalSpec.monitor.delay).toBe(5);
+        expect(finalSpec.monitor.max_retries).toBe(3);
+        expect(finalSpec.monitor.max_retries_down).toBe(3);
         expect(finalSpec.monitor.timeout).toBe(5);
       });
     });
@@ -2320,8 +2320,9 @@
       });
 
       it('should only show pool and monitor details', function() {
-        expect(model.visibleResources).toEqual([]);
+        expect(model.context.id).toEqual('poolId');
       });
+
     });
 
     describe('Model visible resources (edit pool, no existing members)', function() {
@@ -2335,7 +2336,7 @@
       });
 
       it('should only show pool and monitor details', function() {
-        expect(model.visibleResources).toEqual(['pool', 'members', 'monitor']);
+        expect(model.context.id).toEqual('poolId');
       });
     });
 
@@ -2350,7 +2351,24 @@
       });
 
       it('should only show pool and monitor details', function() {
-        expect(model.visibleResources).toEqual(['pool', 'members']);
+        expect(model.context.id).toEqual('poolId');
+      });
+    });
+
+    describe('Model visible resources (edit pool, no session persistence)', function() {
+
+      beforeEach(function() {
+        includeChildResources = true;
+        delete listenerResources.listener;
+        delete listenerResources.monitor;
+        delete listenerResources.pool.session_persistence;
+        model.initialize('pool', 'poolId', 'loadbalancerId');
+        scope.$apply();
+      });
+
+      it('should only show pool and monitor details', function() {
+        model.submit();
+        expect(model.context.id).toEqual('poolId');
       });
     });
 
@@ -2366,7 +2384,7 @@
       });
 
       it('should only show pool and monitor details', function() {
-        expect(model.visibleResources).toEqual(['pool', 'members']);
+        expect(model.context.id).toEqual('poolId');
       });
     });
 
@@ -2382,7 +2400,7 @@
       });
 
       it('should only show pool and monitor details', function() {
-        expect(model.visibleResources).toEqual(['pool', 'members']);
+        expect(model.context.id).toEqual('poolId');
       });
     });
 
@@ -2394,13 +2412,13 @@
       });
 
       it('should set final spec properties', function() {
-        model.spec.monitor.interval = 10;
-        model.spec.monitor.retry = 6;
-        model.spec.monitor.retry_down = 6;
+        model.spec.monitor.delay = 10;
+        model.spec.monitor.max_retries = 6;
+        model.spec.monitor.max_retries_down = 6;
         model.spec.monitor.timeout = 8;
-        model.spec.monitor.method = 'GET';
-        model.spec.monitor.status = '200-204';
-        model.spec.monitor.path = '/foo/bar';
+        model.spec.monitor.http_method = 'GET';
+        model.spec.monitor.expected_codes = '200-204';
+        model.spec.monitor.url_path = '/foo/bar';
 
         var finalSpec = model.submit();
 
@@ -2413,13 +2431,13 @@
         expect(finalSpec.certificates).toBeUndefined();
 
         expect(finalSpec.monitor.type).toBe('HTTP');
-        expect(finalSpec.monitor.interval).toBe(10);
-        expect(finalSpec.monitor.retry).toBe(6);
-        expect(finalSpec.monitor.retry_down).toBe(6);
+        expect(finalSpec.monitor.delay).toBe(10);
+        expect(finalSpec.monitor.max_retries).toBe(6);
+        expect(finalSpec.monitor.max_retries_down).toBe(6);
         expect(finalSpec.monitor.timeout).toBe(8);
-        expect(finalSpec.monitor.method).toBe('GET');
-        expect(finalSpec.monitor.status).toBe('200-204');
-        expect(finalSpec.monitor.path).toBe('/foo/bar');
+        expect(finalSpec.monitor.http_method).toBe('GET');
+        expect(finalSpec.monitor.expected_codes).toBe('200-204');
+        expect(finalSpec.monitor.url_path).toBe('/foo/bar');
       });
 
     });
@@ -2433,7 +2451,7 @@
       });
 
       it('should only show listener details', function() {
-        expect(model.visibleResources).toEqual(['listener']);
+        expect(model.context.resource).toEqual('listener');
       });
     });
 
@@ -2447,7 +2465,7 @@
       });
 
       it('should only show listener, pool, and member details', function() {
-        expect(model.visibleResources).toEqual(['listener', 'pool', 'members']);
+        expect(model.context.resource).toEqual('listener');
       });
     });
 
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.help.html b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.help.html
index dfc2f49f..4f900e45 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.help.html
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.help.html
@@ -5,20 +5,20 @@
   monitor.
 </p>
 <p>
-  <strong translate>Interval:</strong>
+  <strong translate>Delay:</strong>
   <translate>
   The interval between health checks. Must be greater than or equal to the timeout.
   </translate>
 </p>
 <p>
-  <strong translate>Retries:</strong>
+  <strong translate>Max Retries:</strong>
   <translate>
   The number of allowed connection failures before marking the member as inactive. Must be a
   number from 1 to 10.
   </translate>
 </p>
 <p>
-  <strong translate>Retries down:</strong>
+  <strong translate>Max Retries Down:</strong>
   <translate>
   The number of allowed connection failures before marking the member as error. Must be a
   number from 1 to 10. The default is 3.
@@ -32,20 +32,20 @@
   </translate>
 </p>
 <p>
-  <strong translate>HTTP method:</strong>
+  <strong translate>HTTP Method:</strong>
   <translate>
   The HTTP method used to perform the health check.
   </translate>
 </p>
 <p>
-  <strong translate>Expected status codes:</strong>
+  <strong translate>Expected Codes:</strong>
   <translate>
   The expected HTTP status codes to get from a successful health check. Must be a single number,
   a comma separated list of numbers, or a range (two numbers separated by a hyphen).
   </translate>
 </p>
 <p>
-  <strong translate>URL path:</strong>
+  <strong translate>URL Path:</strong>
   <translate>
   The target of the health check HTTP request to the member. Must be a valid URL path.
   </translate>
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.html b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.html
index b04e70e9..bb00cf44 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.html
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.html
@@ -6,7 +6,7 @@
     <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4">
       <div class="form-group required">
         <label class="control-label" for="type">
-          <translate>Monitor type</translate>
+          <translate>Type</translate>
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
         <select class="form-control" name="type" id="type"
@@ -21,11 +21,11 @@
       <div class="form-group required"
            ng-class="{ 'has-error': monitorDetailsForm.retry_down.$invalid && monitorDetailsForm.retry_down.$dirty }">
         <label class="control-label" for="retry_down">
-          <translate>Retries down</translate>
+          <translate>Max Retries Down</translate>
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
         <input name="retry_down" id="retry_down" type="number" class="form-control"
-               ng-model="model.spec.monitor.retry_down" ng-pattern="/^\d+$/" min="1" max="10"
+               ng-model="model.spec.monitor.max_retries_down" ng-pattern="/^\d+$/" min="1" max="10"
                ng-required="true">
         <span class="help-block" ng-show="monitorDetailsForm.retry_down.$invalid && monitorDetailsForm.retry_down.$dirty">
           {$ ::ctrl.retryDownError $}
@@ -41,11 +41,11 @@
       <div class="form-group required"
            ng-class="{ 'has-error': monitorDetailsForm.interval.$invalid && monitorDetailsForm.interval.$dirty }">
         <label class="control-label" for="interval">
-          <translate>Interval (sec)</translate>
+          <translate>Delay (sec)</translate>
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
         <input name="interval" id="interval" type="number" class="form-control"
-               ng-model="model.spec.monitor.interval" ng-pattern="/^\d+$/"
+               ng-model="model.spec.monitor.delay" ng-pattern="/^\d+$/"
                ng-min="model.spec.monitor.timeout" ng-required="true">
         <span class="help-block" ng-show="monitorDetailsForm.interval.$invalid && monitorDetailsForm.interval.$dirty">
           {$ ::ctrl.intervalError $}
@@ -57,11 +57,11 @@
       <div class="form-group required"
            ng-class="{ 'has-error': monitorDetailsForm.retry.$invalid && monitorDetailsForm.retry.$dirty }">
         <label class="control-label" for="retry">
-          <translate>Retries</translate>
+          <translate>Max Retries</translate>
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
         <input name="retry" id="retry" type="number" class="form-control"
-               ng-model="model.spec.monitor.retry" ng-pattern="/^\d+$/" min="1" max="10"
+               ng-model="model.spec.monitor.max_retries" ng-pattern="/^\d+$/" min="1" max="10"
                ng-required="true">
         <span class="help-block" ng-show="monitorDetailsForm.retry.$invalid && monitorDetailsForm.retry.$dirty">
           {$ ::ctrl.retryError $}
@@ -91,10 +91,10 @@
 
     <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4">
       <div class="form-group">
-        <label translate class="control-label" for="method">HTTP method</label>
+        <label translate class="control-label" for="method">HTTP Method</label>
         <select class="form-control" name="method" id="method"
                 ng-options="method for method in model.monitorMethods"
-                ng-model="model.spec.monitor.method">
+                ng-model="model.spec.monitor.http_method">
         </select>
       </div>
     </div>
@@ -102,9 +102,9 @@
     <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4">
       <div class="form-group"
            ng-class="{ 'has-error': monitorDetailsForm.status.$invalid && monitorDetailsForm.status.$dirty }">
-        <label translate class="control-label" for="status">Expected status codes</label>
+        <label translate class="control-label" for="status">Expected Codes</label>
         <input name="status" id="status" type="text" class="form-control"
-               ng-model="model.spec.monitor.status" ng-pattern="::ctrl.statusPattern">
+               ng-model="model.spec.monitor.expected_codes" ng-pattern="::ctrl.statusPattern">
         <span class="help-block" ng-show="monitorDetailsForm.status.$invalid && monitorDetailsForm.status.$dirty">
           {$ ::ctrl.statusError $}
         </span>
@@ -114,9 +114,9 @@
     <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4">
       <div class="form-group"
            ng-class="{ 'has-error': monitorDetailsForm.path.$invalid && monitorDetailsForm.path.$dirty }">
-        <label translate class="control-label" for="path">URL path</label>
+        <label translate class="control-label" for="path">URL Path</label>
         <input name="path" id="path" type="text" class="form-control"
-               ng-model="model.spec.monitor.path" ng-pattern="::ctrl.urlPathPattern">
+               ng-model="model.spec.monitor.url_path" ng-pattern="::ctrl.urlPathPattern">
         <span class="help-block" ng-show="monitorDetailsForm.path.$invalid && monitorDetailsForm.path.$dirty">
           {$ ::ctrl.pathError $}
         </span>
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.html b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.html
index 35aaaba8..8f630419 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.html
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.html
@@ -31,7 +31,7 @@
         </label>
         <select class="form-control" name="method" id="method"
                 ng-options="method for method in model.methods"
-                ng-model="model.spec.pool.method"
+                ng-model="model.spec.pool.lb_algorithm"
                 ng-required="true">
         </select>
       </div>
@@ -64,17 +64,17 @@
         </label>
         <select class="form-control" name="type" id="type"
                 ng-options="type for type in model.types"
-                ng-model="model.spec.pool.type">
+                ng-model="model.spec.pool.session_persistence.type">
           <option value="">None</option>
         </select>
       </div>
     </div>
 
-    <div class="col-xs-12 col-sm-8 col-md-6" ng-if="model.spec.pool.type === 'APP_COOKIE'">
+    <div class="col-xs-12 col-sm-8 col-md-6" ng-if="model.spec.pool.session_persistence.type === 'APP_COOKIE'">
       <div class="form-group">
-        <label translate class="control-label" for="cookie">Cookie</label>
-        <input name="cookie" id="cookie" type="text" class="form-control"
-               ng-model="model.spec.pool.cookie">
+        <label translate class="control-label" for="cookie_name">Cookie Name</label>
+        <input name="cookie_name" id="cookie_name" type="text" class="form-control"
+               ng-model="model.spec.pool.session_persistence.cookie_name">
       </div>
     </div>