diff --git a/samples/olt_device.yaml b/samples/olt_device_host_and_port.yaml
similarity index 91%
rename from samples/olt_device.yaml
rename to samples/olt_device_host_and_port.yaml
index 93c905f..db74731 100644
--- a/samples/olt_device.yaml
+++ b/samples/olt_device_host_and_port.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @olt_device.yaml http://192.168.99.100:30007/run
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @olt_device_host_and_port.yaml http://192.168.99.100:30007/run
 
 tosca_definitions_version: tosca_simple_yaml_1_0
 imports:
@@ -32,7 +32,7 @@
       type: tosca.nodes.OLTDevice
       properties:
         name: test_olt
-        device_type: simulated_olt
+        device_type: ponsim
         host: 172.17.0.1
         port: 50060
         switch_datapath_id: of:0000000000000001
diff --git a/samples/olt_device.yaml b/samples/olt_device_mac_address.yaml
similarity index 90%
copy from samples/olt_device.yaml
copy to samples/olt_device_mac_address.yaml
index 93c905f..42213bb 100644
--- a/samples/olt_device.yaml
+++ b/samples/olt_device_mac_address.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @olt_device.yaml http://192.168.99.100:30007/run
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @olt_device_mac_address.yaml http://192.168.99.100:30007/run
 
 tosca_definitions_version: tosca_simple_yaml_1_0
 imports:
@@ -33,8 +33,7 @@
       properties:
         name: test_olt
         device_type: simulated_olt
-        host: 172.17.0.1
-        port: 50060
+        mac_address: 00:0c:e2:31:40:00
         switch_datapath_id: of:0000000000000001
         switch_port: "1"
         outer_tpid: "0x8100"