ONOS-6769 Support for PacketMetadata in demo P4 programs

Change-Id: I9b3de719f9eb1c87d1df16a5ad0d08a83cebc8f6
diff --git a/tools/test/p4src/p4-16/include/metadata.p4 b/tools/test/p4src/p4-16/include/metadata.p4
index e08057c..a026e2d 100644
--- a/tools/test/p4src/p4-16/include/metadata.p4
+++ b/tools/test/p4src/p4-16/include/metadata.p4
@@ -2,19 +2,19 @@
 #define METADATA
 
 struct ecmp_metadata_t {
-    bit<16> groupId;
+    bit<16> group_id;
     bit<16> selector;
 }
 
-struct wcmp_meta_t {
-    bit<16> groupId;
+struct wcmp_metadata_t {
+    bit<16> group_id;
     bit<8>  numBits;
     bit<64> selector;
 }
 
-struct metadata {
+struct metadata_t {
     ecmp_metadata_t ecmp_metadata;
-    wcmp_meta_t wcmp_meta;
+    wcmp_metadata_t wcmp_meta;
     intrinsic_metadata_t intrinsic_metadata;
 }
 #endif