diff --git a/src/ostorlab/agent/message/proto/v3/report/cve/cve.proto b/src/ostorlab/agent/message/proto/v3/report/cve/cve.proto
index d1cd9ae97..84d33b23b 100644
--- a/src/ostorlab/agent/message/proto/v3/report/cve/cve.proto
+++ b/src/ostorlab/agent/message/proto/v3/report/cve/cve.proto
@@ -14,9 +14,9 @@ message Message {
 }
 
 message CVSS { 
-    optional CVSSv31 v31 = 1;
-    optional CVSSv31 cvss_v3_0 = 2;
-    optional CVSSv2 cvss_v2 = 3;
+    optional CVSSv3 v31 = 1;
+    optional CVSSv3 v30 = 2;
+    optional CVSSv2 v2 = 3;
 }
 
 message CVSSv2 {
@@ -41,7 +41,7 @@ message CVSSv2 {
     optional string target_distribution = 19;
 }
 
-message CVSSv31 {
+message CVSSv3 {
     optional string version = 1;
     optional string vector_string = 2;
     optional string confidentiality_impact = 3;
diff --git a/src/ostorlab/agent/message/proto/v3/report/cve/cve_pb2.py b/src/ostorlab/agent/message/proto/v3/report/cve/cve_pb2.py
index fedbf6377..590c79565 100644
--- a/src/ostorlab/agent/message/proto/v3/report/cve/cve_pb2.py
+++ b/src/ostorlab/agent/message/proto/v3/report/cve/cve_pb2.py
@@ -13,7 +13,7 @@
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n4ostorlab/agent/message/proto/v3/report/cve/cve.proto\x12*ostorlab.agent.message.proto.v3.report.cve\"\xc1\x02\n\x07Message\x12\x0e\n\x06\x63ve_id\x18\x01 \x01(\t\x12\x43\n\x07targets\x18\x02 \x03(\x0b\x32\x32.ostorlab.agent.message.proto.v3.report.cve.Target\x12\x0b\n\x03\x63we\x18\x03 \x01(\x05\x12\x13\n\x0b\x64\x65scription\x18\x04 \x01(\t\x12I\n\nreferences\x18\x05 \x03(\x0b\x32\x35.ostorlab.agent.message.proto.v3.report.cve.Reference\x12\x45\n\x0b\x63vss_scores\x18\x06 \x01(\x0b\x32\x30.ostorlab.agent.message.proto.v3.report.cve.CVSS\x12\x16\n\x0epublished_date\x18\x07 \x01(\x04\x12\x15\n\rmodified_date\x18\x08 \x01(\x04\"\xd5\x01\n\x04\x43VSS\x12@\n\x03v31\x18\x01 \x01(\x0b\x32\x33.ostorlab.agent.message.proto.v3.report.cve.CVSSv31\x12\x46\n\tcvss_v3_0\x18\x02 \x01(\x0b\x32\x33.ostorlab.agent.message.proto.v3.report.cve.CVSSv31\x12\x43\n\x07\x63vss_v2\x18\x03 \x01(\x0b\x32\x32.ostorlab.agent.message.proto.v3.report.cve.CVSSv2\"\x90\x04\n\x06\x43VSSv2\x12\x0f\n\x07version\x18\x01 \x01(\t\x12\x15\n\rvector_string\x18\x02 \x01(\t\x12\x1e\n\x16\x63onfidentiality_impact\x18\x03 \x01(\t\x12\x18\n\x10integrity_impact\x18\x04 \x01(\t\x12\x1b\n\x13\x61vailability_impact\x18\x05 \x01(\t\x12\x12\n\nbase_score\x18\x06 \x01(\x02\x12\x19\n\x11remediation_level\x18\x07 \x01(\t\x12\x19\n\x11report_confidence\x18\x08 \x01(\t\x12\x16\n\x0etemporal_score\x18\t \x01(\x02\x12#\n\x1b\x63onfidentiality_requirement\x18\n \x01(\t\x12\x1d\n\x15integrity_requirement\x18\x0b \x01(\t\x12 \n\x18\x61vailability_requirement\x18\x0c \x01(\t\x12\x1b\n\x13\x65nvironmental_score\x18\r \x01(\x02\x12\x15\n\raccess_vector\x18\x0e \x01(\t\x12\x19\n\x11\x61\x63\x63\x65ss_complexity\x18\x0f \x01(\t\x12\x16\n\x0e\x61uthentication\x18\x10 \x01(\t\x12\x16\n\x0e\x65xploitability\x18\x11 \x01(\t\x12#\n\x1b\x63ollateral_damage_potential\x18\x12 \x01(\t\x12\x1b\n\x13target_distribution\x18\x13 \x01(\t\"\xed\x06\n\x07\x43VSSv31\x12\x0f\n\x07version\x18\x01 \x01(\t\x12\x15\n\rvector_string\x18\x02 \x01(\t\x12\x1e\n\x16\x63onfidentiality_impact\x18\x03 \x01(\t\x12\x18\n\x10integrity_impact\x18\x04 \x01(\t\x12\x1b\n\x13\x61vailability_impact\x18\x05 \x01(\t\x12\x12\n\nbase_score\x18\x06 \x01(\x02\x12\x19\n\x11remediation_level\x18\x07 \x01(\t\x12\x19\n\x11report_confidence\x18\x08 \x01(\t\x12\x16\n\x0etemporal_score\x18\t \x01(\x02\x12#\n\x1b\x63onfidentiality_requirement\x18\n \x01(\t\x12\x1d\n\x15integrity_requirement\x18\x0b \x01(\t\x12 \n\x18\x61vailability_requirement\x18\x0c \x01(\t\x12\x1b\n\x13\x65nvironmental_score\x18\r \x01(\x02\x12\x15\n\rattack_vector\x18\x0e \x01(\t\x12\x19\n\x11\x61ttack_complexity\x18\x0f \x01(\t\x12\x1b\n\x13privileges_required\x18\x10 \x01(\t\x12\x18\n\x10user_interaction\x18\x11 \x01(\t\x12\r\n\x05scope\x18\x12 \x01(\t\x12\x15\n\rbase_severity\x18\x13 \x01(\t\x12\x1d\n\x15\x65xploit_code_maturity\x18\x14 \x01(\t\x12\x19\n\x11temporal_severity\x18\x15 \x01(\t\x12\x1e\n\x16modified_attack_vector\x18\x16 \x01(\t\x12\"\n\x1amodified_attack_complexity\x18\x17 \x01(\t\x12$\n\x1cmodified_privileges_required\x18\x18 \x01(\t\x12!\n\x19modified_user_interaction\x18\x19 \x01(\t\x12\x16\n\x0emodified_scope\x18\x1a \x01(\t\x12\'\n\x1fmodified_confidentiality_impact\x18\x1b \x01(\t\x12!\n\x19modified_integrity_impact\x18\x1c \x01(\t\x12$\n\x1cmodified_availability_impact\x18\x1d \x01(\t\x12\x1e\n\x16\x65nvironmental_severity\x18\x1e \x01(\t\"6\n\tReference\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x0e\n\x06source\x18\x02 \x01(\t\x12\x0c\n\x04tags\x18\x03 \x03(\t\"V\n\x0cVersionMatch\x12\r\n\x05start\x18\x01 \x01(\t\x12\x15\n\rstart_include\x18\x02 \x01(\x08\x12\x0b\n\x03\x65nd\x18\x03 \x01(\t\x12\x13\n\x0b\x65nd_include\x18\x04 \x01(\x08\"\x86\x02\n\x08\x43peMatch\x12\x0c\n\x04part\x18\x01 \x01(\t\x12\x0e\n\x06vendor\x18\x02 \x01(\t\x12\x0f\n\x07product\x18\x03 \x01(\t\x12I\n\x07version\x18\x04 \x01(\x0b\x32\x38.ostorlab.agent.message.proto.v3.report.cve.VersionMatch\x12\x0e\n\x06update\x18\x05 \x01(\t\x12\x0f\n\x07\x65\x64ition\x18\x06 \x01(\t\x12\x10\n\x08language\x18\x07 \x01(\t\x12\x12\n\nsw_edition\x18\x08 \x01(\t\x12\n\n\x02sw\x18\t \x01(\t\x12\n\n\x02hw\x18\n \x01(\t\x12\r\n\x05other\x18\x0b \x01(\t\x12\x12\n\nvulnerable\x18\x0c \x01(\x08\"S\n\x06Target\x12I\n\x0b\x63pe_matches\x18\x01 \x03(\x0b\x32\x34.ostorlab.agent.message.proto.v3.report.cve.CpeMatch')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n4ostorlab/agent/message/proto/v3/report/cve/cve.proto\x12*ostorlab.agent.message.proto.v3.report.cve\"\xc1\x02\n\x07Message\x12\x0e\n\x06\x63ve_id\x18\x01 \x01(\t\x12\x43\n\x07targets\x18\x02 \x03(\x0b\x32\x32.ostorlab.agent.message.proto.v3.report.cve.Target\x12\x0b\n\x03\x63we\x18\x03 \x01(\x05\x12\x13\n\x0b\x64\x65scription\x18\x04 \x01(\t\x12I\n\nreferences\x18\x05 \x03(\x0b\x32\x35.ostorlab.agent.message.proto.v3.report.cve.Reference\x12\x45\n\x0b\x63vss_scores\x18\x06 \x01(\x0b\x32\x30.ostorlab.agent.message.proto.v3.report.cve.CVSS\x12\x16\n\x0epublished_date\x18\x07 \x01(\x04\x12\x15\n\rmodified_date\x18\x08 \x01(\x04\"\xc8\x01\n\x04\x43VSS\x12?\n\x03v31\x18\x01 \x01(\x0b\x32\x32.ostorlab.agent.message.proto.v3.report.cve.CVSSv3\x12?\n\x03v30\x18\x02 \x01(\x0b\x32\x32.ostorlab.agent.message.proto.v3.report.cve.CVSSv3\x12>\n\x02v2\x18\x03 \x01(\x0b\x32\x32.ostorlab.agent.message.proto.v3.report.cve.CVSSv2\"\x90\x04\n\x06\x43VSSv2\x12\x0f\n\x07version\x18\x01 \x01(\t\x12\x15\n\rvector_string\x18\x02 \x01(\t\x12\x1e\n\x16\x63onfidentiality_impact\x18\x03 \x01(\t\x12\x18\n\x10integrity_impact\x18\x04 \x01(\t\x12\x1b\n\x13\x61vailability_impact\x18\x05 \x01(\t\x12\x12\n\nbase_score\x18\x06 \x01(\x02\x12\x19\n\x11remediation_level\x18\x07 \x01(\t\x12\x19\n\x11report_confidence\x18\x08 \x01(\t\x12\x16\n\x0etemporal_score\x18\t \x01(\x02\x12#\n\x1b\x63onfidentiality_requirement\x18\n \x01(\t\x12\x1d\n\x15integrity_requirement\x18\x0b \x01(\t\x12 \n\x18\x61vailability_requirement\x18\x0c \x01(\t\x12\x1b\n\x13\x65nvironmental_score\x18\r \x01(\x02\x12\x15\n\raccess_vector\x18\x0e \x01(\t\x12\x19\n\x11\x61\x63\x63\x65ss_complexity\x18\x0f \x01(\t\x12\x16\n\x0e\x61uthentication\x18\x10 \x01(\t\x12\x16\n\x0e\x65xploitability\x18\x11 \x01(\t\x12#\n\x1b\x63ollateral_damage_potential\x18\x12 \x01(\t\x12\x1b\n\x13target_distribution\x18\x13 \x01(\t\"\xec\x06\n\x06\x43VSSv3\x12\x0f\n\x07version\x18\x01 \x01(\t\x12\x15\n\rvector_string\x18\x02 \x01(\t\x12\x1e\n\x16\x63onfidentiality_impact\x18\x03 \x01(\t\x12\x18\n\x10integrity_impact\x18\x04 \x01(\t\x12\x1b\n\x13\x61vailability_impact\x18\x05 \x01(\t\x12\x12\n\nbase_score\x18\x06 \x01(\x02\x12\x19\n\x11remediation_level\x18\x07 \x01(\t\x12\x19\n\x11report_confidence\x18\x08 \x01(\t\x12\x16\n\x0etemporal_score\x18\t \x01(\x02\x12#\n\x1b\x63onfidentiality_requirement\x18\n \x01(\t\x12\x1d\n\x15integrity_requirement\x18\x0b \x01(\t\x12 \n\x18\x61vailability_requirement\x18\x0c \x01(\t\x12\x1b\n\x13\x65nvironmental_score\x18\r \x01(\x02\x12\x15\n\rattack_vector\x18\x0e \x01(\t\x12\x19\n\x11\x61ttack_complexity\x18\x0f \x01(\t\x12\x1b\n\x13privileges_required\x18\x10 \x01(\t\x12\x18\n\x10user_interaction\x18\x11 \x01(\t\x12\r\n\x05scope\x18\x12 \x01(\t\x12\x15\n\rbase_severity\x18\x13 \x01(\t\x12\x1d\n\x15\x65xploit_code_maturity\x18\x14 \x01(\t\x12\x19\n\x11temporal_severity\x18\x15 \x01(\t\x12\x1e\n\x16modified_attack_vector\x18\x16 \x01(\t\x12\"\n\x1amodified_attack_complexity\x18\x17 \x01(\t\x12$\n\x1cmodified_privileges_required\x18\x18 \x01(\t\x12!\n\x19modified_user_interaction\x18\x19 \x01(\t\x12\x16\n\x0emodified_scope\x18\x1a \x01(\t\x12\'\n\x1fmodified_confidentiality_impact\x18\x1b \x01(\t\x12!\n\x19modified_integrity_impact\x18\x1c \x01(\t\x12$\n\x1cmodified_availability_impact\x18\x1d \x01(\t\x12\x1e\n\x16\x65nvironmental_severity\x18\x1e \x01(\t\"6\n\tReference\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x0e\n\x06source\x18\x02 \x01(\t\x12\x0c\n\x04tags\x18\x03 \x03(\t\"V\n\x0cVersionMatch\x12\r\n\x05start\x18\x01 \x01(\t\x12\x15\n\rstart_include\x18\x02 \x01(\x08\x12\x0b\n\x03\x65nd\x18\x03 \x01(\t\x12\x13\n\x0b\x65nd_include\x18\x04 \x01(\x08\"\x86\x02\n\x08\x43peMatch\x12\x0c\n\x04part\x18\x01 \x01(\t\x12\x0e\n\x06vendor\x18\x02 \x01(\t\x12\x0f\n\x07product\x18\x03 \x01(\t\x12I\n\x07version\x18\x04 \x01(\x0b\x32\x38.ostorlab.agent.message.proto.v3.report.cve.VersionMatch\x12\x0e\n\x06update\x18\x05 \x01(\t\x12\x0f\n\x07\x65\x64ition\x18\x06 \x01(\t\x12\x10\n\x08language\x18\x07 \x01(\t\x12\x12\n\nsw_edition\x18\x08 \x01(\t\x12\n\n\x02sw\x18\t \x01(\t\x12\n\n\x02hw\x18\n \x01(\t\x12\r\n\x05other\x18\x0b \x01(\t\x12\x12\n\nvulnerable\x18\x0c \x01(\x08\"S\n\x06Target\x12I\n\x0b\x63pe_matches\x18\x01 \x03(\x0b\x32\x34.ostorlab.agent.message.proto.v3.report.cve.CpeMatch')
 
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'ostorlab.agent.message.proto.v3.report.cve.cve_pb2', globals())
@@ -23,17 +23,17 @@
   _MESSAGE._serialized_start=101
   _MESSAGE._serialized_end=422
   _CVSS._serialized_start=425
-  _CVSS._serialized_end=638
-  _CVSSV2._serialized_start=641
-  _CVSSV2._serialized_end=1169
-  _CVSSV31._serialized_start=1172
-  _CVSSV31._serialized_end=2049
-  _REFERENCE._serialized_start=2051
-  _REFERENCE._serialized_end=2105
-  _VERSIONMATCH._serialized_start=2107
-  _VERSIONMATCH._serialized_end=2193
-  _CPEMATCH._serialized_start=2196
-  _CPEMATCH._serialized_end=2458
-  _TARGET._serialized_start=2460
-  _TARGET._serialized_end=2543
+  _CVSS._serialized_end=625
+  _CVSSV2._serialized_start=628
+  _CVSSV2._serialized_end=1156
+  _CVSSV3._serialized_start=1159
+  _CVSSV3._serialized_end=2035
+  _REFERENCE._serialized_start=2037
+  _REFERENCE._serialized_end=2091
+  _VERSIONMATCH._serialized_start=2093
+  _VERSIONMATCH._serialized_end=2179
+  _CPEMATCH._serialized_start=2182
+  _CPEMATCH._serialized_end=2444
+  _TARGET._serialized_start=2446
+  _TARGET._serialized_end=2529
 # @@protoc_insertion_point(module_scope)