diff --git a/src/smf/packet-smf.c b/src/smf/packet-smf.c
index 0f19320..504591c 100644
--- a/src/smf/packet-smf.c
+++ b/src/smf/packet-smf.c
@@ -3327,7 +3327,7 @@ void proto_reg_handoff_smf(void)
         subctrl_handle = find_dissector("solace.subctrl");
         xmllink_handle = find_dissector("solace.xmllink");
         assuredctrl_handle = find_dissector("solace.assuredctrl");
-        smp_handle = find_dissector("solace.smp");
+        smp_handle = find_dissector("solace.sol-smp");
         smrp_handle = find_dissector("solace.smrp");
         clientctrl_handle = find_dissector("solace.clientctrl");
         bm_handle = find_dissector("solace.smf-bm");
diff --git a/src/smf/packet-smp.c b/src/smf/packet-smp.c
index 0e2f797..4ef39b6 100644
--- a/src/smf/packet-smp.c
+++ b/src/smf/packet-smp.c
@@ -334,63 +334,63 @@ proto_register_smp(void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
 	static hf_register_info hf[] = {
 		{ &hf_smp_uh,
-			{ "UH",           "smp.uh",
+			{ "UH",           "sol-smp.uh",
 			FT_UINT8, BASE_DEC, NULL, 0x80,          
 			"", HFILL }
 		},
 		{ &hf_smp_msg_type,
-			{ "Message type",           "smp.msg_type",
+			{ "Message type",           "sol-smp.msg_type",
 			FT_UINT8, BASE_HEX, VALS(msgtypenames), 0x7f,          
 			"", HFILL }
 		},
 		{ &hf_smp_msg_len,
-			{ "Message length",           "smp.msg_len",
+			{ "Message length",           "sol-smp.msg_len",
 			FT_UINT32, BASE_DEC, NULL, 0x00,          
 			"", HFILL }
 		},
         { &hf_smp_payload,
-            { "Payload",           "smp.payload",
+            { "Payload",           "sol-smp.payload",
             FT_BYTES, BASE_NONE, NULL, 0x00,
             "", HFILL }
         },
 
 		{ &hf_smp_add_da,
-			{ "DeliverAlways",           "smp.da",
+			{ "DeliverAlways",           "sol-smp.da",
 			FT_BOOLEAN, 8, NULL, 0x10,          
 			"", HFILL }
 		},
 		{ &hf_smp_add_r,
-			{ "ResponseRequired",           "smp.r",
+			{ "ResponseRequired",           "sol-smp.r",
 			FT_BOOLEAN, 8, NULL, 0x08,          
 			"", HFILL }
 		},
 		{ &hf_smp_add_t,
-			{ "Topic",           "smp.t",
+			{ "Topic",           "sol-smp.t",
 			FT_BOOLEAN, 8, NULL, 0x04,          
 			"", HFILL }
 		},
 		{ &hf_smp_add_p,
-			{ "Persist",           "smp.p",
+			{ "Persist",           "sol-smp.p",
 			FT_BOOLEAN, 8, NULL, 0x02,          
 			"", HFILL }
 		},
 		{ &hf_smp_add_f,
-			{ "Filter",           "smp.f",
+			{ "Filter",           "sol-smp.f",
 			FT_BOOLEAN, 8, NULL, 0x01,          
 			"", HFILL }
 		},
         { &hf_smp_add_subscription,
-            { "SubscriptionString", "smp.subscription",
+            { "SubscriptionString", "sol-smp.subscription",
             FT_STRING, BASE_NONE, NULL, 0x0,
             "", HFILL }
         },
         { &hf_smp_add_queuename,
-            { "Queue", "smp.queue",
+            { "Queue", "sol-smp.queue",
             FT_STRING, BASE_NONE, NULL, 0x0,
             "", HFILL }
         },
         { &hf_smp_add_clientname,
-            { "ClientName", "smp.clientname",
+            { "ClientName", "sol-smp.clientname",
             FT_STRING, BASE_NONE, NULL, 0x0,
             "", HFILL }
         },
@@ -410,7 +410,7 @@ proto_register_smp(void)
 	proto_register_field_array(proto_smp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-    register_dissector("solace.smp", dissect_smp, proto_smp);
+    register_dissector("solace.sol-smp", dissect_smp, proto_smp);
         
 #if 0
 /* Register preferences module (See Section 2.6 for more on preferences) */