diff --git a/src/python/of10/class_maps.py b/src/python/of10/class_maps.py
index 19600e6..7e61571 100644
--- a/src/python/of10/class_maps.py
+++ b/src/python/of10/class_maps.py
@@ -194,17 +194,17 @@
     'ofp_match'                     : [
                                        'wildcards',
                                        'in_port',
-                                       'dl_src',
-                                       'dl_dst',
-                                       'dl_vlan',
-                                       'dl_vlan_pcp',
-                                       'dl_type',
-                                       'nw_tos',
-                                       'nw_proto',
-                                       'nw_src',
-                                       'nw_dst',
-                                       'tp_src',
-                                       'tp_dst'
+                                       'eth_src',
+                                       'eth_dst',
+                                       'vlan_vid',
+                                       'vlan_pcp',
+                                       'eth_type',
+                                       'ip_dscp',
+                                       'ip_proto',
+                                       'ipv4_src',
+                                       'ipv4_dst',
+                                       'tcp_src',
+                                       'tcp_dst'
                                       ],
     'ofp_header'                    : [
                                        'version',