Change naming convention of checksum struct

- Change the name of Checksum struct so that it can be used by all spdx versions
- Remove unnecessary commented code

Signed-off-by: specter25 <ujjwalcoding012@gmail.com>

15 files changed, 128 insertions, 212 deletions

diff --git a/builder/build_test.go b/builder/build_test.go
index d7e3045..0c30679 100644
--- a/builder/build_test.go
+++ b/builder/build_test.go
@@ -499,15 +499,6 @@ func TestBuild2_2CreatesDocument(t *testing.T) {
 		}
 	}
 
-	// if fileEmpty.FileChecksumSHA1 != "da39a3ee5e6b4b0d3255bfef95601890afd80709" {
-	// 	t.Errorf("expected %v, got %v", "da39a3ee5e6b4b0d3255bfef95601890afd80709", fileEmpty.FileChecksumSHA1)
-	// }
-	// if fileEmpty.FileChecksumSHA256 != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" {
-	// 	t.Errorf("expected %v, got %v", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", fileEmpty.FileChecksumSHA256)
-	// }
-	// if fileEmpty.FileChecksumMD5 != "d41d8cd98f00b204e9800998ecf8427e" {
-	// 	t.Errorf("expected %v, got %v", "d41d8cd98f00b204e9800998ecf8427e", fileEmpty.FileChecksumMD5)
-	// }
 	if fileEmpty.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.LicenseConcluded)
 	}
@@ -546,15 +537,6 @@ func TestBuild2_2CreatesDocument(t *testing.T) {
 		}
 	}
 
-	// if file1.FileChecksumSHA1 != "024f870eb6323f532515f7a09d5646a97083b819" {
-	// 	t.Errorf("expected %v, got %v", "024f870eb6323f532515f7a09d5646a97083b819", file1.FileChecksumSHA1)
-	// }
-	// if file1.FileChecksumSHA256 != "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf" {
-	// 	t.Errorf("expected %v, got %v", "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf", file1.FileChecksumSHA256)
-	// }
-	// if file1.FileChecksumMD5 != "37c8208479dfe42d2bb29debd6e32d4a" {
-	// 	t.Errorf("expected %v, got %v", "37c8208479dfe42d2bb29debd6e32d4a", file1.FileChecksumMD5)
-	// }
 	if file1.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", file1.LicenseConcluded)
 	}
@@ -593,15 +575,6 @@ func TestBuild2_2CreatesDocument(t *testing.T) {
 		}
 	}
 
-	// if file3.FileChecksumSHA1 != "a46114b70e163614f01c64adf44cdd438f158fce" {
-	// 	t.Errorf("expected %v, got %v", "a46114b70e163614f01c64adf44cdd438f158fce", file3.FileChecksumSHA1)
-	// }
-	// if file3.FileChecksumSHA256 != "9fc181b9892720a15df1a1e561860318db40621bd4040ccdf18e110eb01d04b4" {
-	// 	t.Errorf("expected %v, got %v", "9fc181b9892720a15df1a1e561860318db40621bd4040ccdf18e110eb01d04b4", file3.FileChecksumSHA256)
-	// }
-	// if file3.FileChecksumMD5 != "3e02d3ab9c58eec6911dbba37570934f" {
-	// 	t.Errorf("expected %v, got %v", "3e02d3ab9c58eec6911dbba37570934f", file3.FileChecksumMD5)
-	// }
 	if file3.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", file3.LicenseConcluded)
 	}
@@ -640,15 +613,6 @@ func TestBuild2_2CreatesDocument(t *testing.T) {
 		}
 	}
 
-	// if file4.FileChecksumSHA1 != "e623d7d7d782a7c8323c4d436acee4afab34320f" {
-	// 	t.Errorf("expected %v, got %v", "e623d7d7d782a7c8323c4d436acee4afab34320f", file4.FileChecksumSHA1)
-	// }
-	// if file4.FileChecksumSHA256 != "574fa42c5e0806c0f8906a44884166540206f021527729407cd5326838629c59" {
-	// 	t.Errorf("expected %v, got %v", "574fa42c5e0806c0f8906a44884166540206f021527729407cd5326838629c59", file4.FileChecksumSHA256)
-	// }
-	// if file4.FileChecksumMD5 != "96e6a25d35df5b1c477710ef4d0c7210" {
-	// 	t.Errorf("expected %v, got %v", "96e6a25d35df5b1c477710ef4d0c7210", file4.FileChecksumMD5)
-	// }
 	if file4.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", file4.LicenseConcluded)
 	}
@@ -686,15 +650,6 @@ func TestBuild2_2CreatesDocument(t *testing.T) {
 			}
 		}
 	}
-	// if lastfile.FileChecksumSHA1 != "26d6221d682d9ba59116f9753a701f34271c8ce1" {
-	// 	t.Errorf("expected %v, got %v", "26d6221d682d9ba59116f9753a701f34271c8ce1", lastfile.FileChecksumSHA1)
-	// }
-	// if lastfile.FileChecksumSHA256 != "0a4bdaf990e9b330ff72022dd78110ae98b60e08337cf2105b89856373416805" {
-	// 	t.Errorf("expected %v, got %v", "0a4bdaf990e9b330ff72022dd78110ae98b60e08337cf2105b89856373416805", lastfile.FileChecksumSHA256)
-	// }
-	// if lastfile.FileChecksumMD5 != "f60baa793870d9085461ad6bbab50b7f" {
-	// 	t.Errorf("expected %v, got %v", "f60baa793870d9085461ad6bbab50b7f", lastfile.FileChecksumMD5)
-	// }
 	if lastfile.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", lastfile.LicenseConcluded)
 	}
diff --git a/builder/builder2v2/build_file.go b/builder/builder2v2/build_file.go
index 2791160..7a267ad 100644
--- a/builder/builder2v2/build_file.go
+++ b/builder/builder2v2/build_file.go
@@ -32,24 +32,21 @@ func BuildFileSection2_2(filePath string, prefix string, fileNumber int) (*spdx.
 	f := &spdx.File2_2{
 		FileName:           filePath,
 		FileSPDXIdentifier: spdx.ElementID(i),
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     ssha1,
 			},
-			spdx.SHA256: spdx.Checksum2_2{
+			spdx.SHA256: spdx.Checksum{
 				Algorithm: spdx.SHA256,
 				Value:     ssha256,
 			},
-			spdx.MD5: spdx.Checksum2_2{
+			spdx.MD5: spdx.Checksum{
 				Algorithm: spdx.MD5,
 				Value:     smd5,
 			},
 		},
 
-		// FileChecksumSHA1:   ssha1,
-		// FileChecksumSHA256: ssha256,
-		// FileChecksumMD5:    smd5,
 		LicenseConcluded:  "NOASSERTION",
 		LicenseInfoInFile: []string{},
 		FileCopyrightText: "NOASSERTION",
diff --git a/builder/builder2v2/build_package_test.go b/builder/builder2v2/build_package_test.go
index 47f7604..044721f 100644
--- a/builder/builder2v2/build_package_test.go
+++ b/builder/builder2v2/build_package_test.go
@@ -88,15 +88,6 @@ func TestBuilder2_2CanBuildPackageSection(t *testing.T) {
 		}
 	}
 
-	// if fileEmpty.FileChecksumSHA1 != "da39a3ee5e6b4b0d3255bfef95601890afd80709" {
-	// 	t.Errorf("expected %v, got %v", "da39a3ee5e6b4b0d3255bfef95601890afd80709", fileEmpty.FileChecksumSHA1)
-	// }
-	// if fileEmpty.FileChecksumSHA256 != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" {
-	// 	t.Errorf("expected %v, got %v", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", fileEmpty.FileChecksumSHA256)
-	// }
-	// if fileEmpty.FileChecksumMD5 != "d41d8cd98f00b204e9800998ecf8427e" {
-	// 	t.Errorf("expected %v, got %v", "d41d8cd98f00b204e9800998ecf8427e", fileEmpty.FileChecksumMD5)
-	// }
 	if fileEmpty.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.LicenseConcluded)
 	}
diff --git a/licensediff/licensediff_test.go b/licensediff/licensediff_test.go
index 26622f0..ec8b728 100644
--- a/licensediff/licensediff_test.go
+++ b/licensediff/licensediff_test.go
@@ -501,9 +501,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 	f1 := &spdx.File2_2{
 		FileName:           "/project/file1.txt",
 		FileSPDXIdentifier: spdx.ElementID("File561"),
-		// FileChecksumSHA1:   "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
@@ -520,9 +519,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 	f2 := &spdx.File2_2{
 		FileName:           "/project/file2.txt",
 		FileSPDXIdentifier: spdx.ElementID("File562"),
-		// FileChecksumSHA1:   "066c5139bd9a43d15812ec1a1755b08ccf199824",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
@@ -539,9 +537,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 	f3 := &spdx.File2_2{
 		FileName:           "/project/file3.txt",
 		FileSPDXIdentifier: spdx.ElementID("File563"),
-		// FileChecksumSHA1:   "bd0f4863b15fad2b79b35303af54fcb5baaf7c68",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
@@ -559,9 +556,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 	f4_1 := &spdx.File2_2{
 		FileName:           "/project/file4.txt",
 		FileSPDXIdentifier: spdx.ElementID("File564"),
-		// FileChecksumSHA1:   "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
@@ -576,9 +572,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 	f4_2 := &spdx.File2_2{
 		FileName:           "/project/file4.txt",
 		FileSPDXIdentifier: spdx.ElementID("File564"),
-		// FileChecksumSHA1:   "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
@@ -596,9 +591,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 	f5_1 := &spdx.File2_2{
 		FileName:           "/project/file5.txt",
 		FileSPDXIdentifier: spdx.ElementID("File565"),
-		// FileChecksumSHA1:   "ba226db943bbbf455da77afab6f16dbab156d000",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
@@ -613,9 +607,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 	f5_2 := &spdx.File2_2{
 		FileName:           "/project/file5.txt",
 		FileSPDXIdentifier: spdx.ElementID("File565"),
-		// FileChecksumSHA1:   "b6e0ec7d085c5699b46f6f8d425413702652874d",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
@@ -633,9 +626,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 	f6_1 := &spdx.File2_2{
 		FileName:           "/project/file6.txt",
 		FileSPDXIdentifier: spdx.ElementID("File566"),
-		// FileChecksumSHA1:   "ba226db943bbbf455da77afab6f16dbab156d000",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
@@ -650,9 +642,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 	f6_2 := &spdx.File2_2{
 		FileName:           "/project/file6.txt",
 		FileSPDXIdentifier: spdx.ElementID("File566"),
-		// FileChecksumSHA1:   "b6e0ec7d085c5699b46f6f8d425413702652874d",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
@@ -803,9 +794,8 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
 	f1 := &spdx.File2_2{
 		FileName:           "/project/file1.txt",
 		FileSPDXIdentifier: spdx.ElementID("File561"),
-		// FileChecksumSHA1:   "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
@@ -822,9 +812,8 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
 	f2 := &spdx.File2_2{
 		FileName:           "/project/file2.txt",
 		FileSPDXIdentifier: spdx.ElementID("File562"),
-		// FileChecksumSHA1:   "066c5139bd9a43d15812ec1a1755b08ccf199824",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
@@ -841,9 +830,8 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
 	f3 := &spdx.File2_2{
 		FileName:           "/project/file3.txt",
 		FileSPDXIdentifier: spdx.ElementID("File563"),
-		// FileChecksumSHA1:   "bd0f4863b15fad2b79b35303af54fcb5baaf7c68",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
@@ -861,9 +849,8 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
 	f4_1 := &spdx.File2_2{
 		FileName:           "/project/file4.txt",
 		FileSPDXIdentifier: spdx.ElementID("File564"),
-		// FileChecksumSHA1:   "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
@@ -878,9 +865,8 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
 	f4_2 := &spdx.File2_2{
 		FileName:           "/project/file4.txt",
 		FileSPDXIdentifier: spdx.ElementID("File564"),
-		// FileChecksumSHA1:   "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
@@ -898,8 +884,7 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
 	f5_1 := &spdx.File2_2{
 		FileName:           "/project/file5.txt",
 		FileSPDXIdentifier: spdx.ElementID("File565"),
-		// FileChecksumSHA1:   "ba226db943bbbf455da77afab6f16dbab156d000",
-		LicenseConcluded: "BSD-3-Clause",
+		LicenseConcluded:   "BSD-3-Clause",
 		LicenseInfoInFile: []string{
 			"NOASSERTION",
 		},
@@ -908,9 +893,8 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
 	f5_2 := &spdx.File2_2{
 		FileName:           "/project/file5.txt",
 		FileSPDXIdentifier: spdx.ElementID("File565"),
-		// FileChecksumSHA1:   "b6e0ec7d085c5699b46f6f8d425413702652874d",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
@@ -928,9 +912,8 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
 	f6_1 := &spdx.File2_2{
 		FileName:           "/project/file6.txt",
 		FileSPDXIdentifier: spdx.ElementID("File566"),
-		// FileChecksumSHA1:   "ba226db943bbbf455da77afab6f16dbab156d000",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
@@ -945,9 +928,8 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
 	f6_2 := &spdx.File2_2{
 		FileName:           "/project/file6.txt",
 		FileSPDXIdentifier: spdx.ElementID("File566"),
-		// FileChecksumSHA1:   "b6e0ec7d085c5699b46f6f8d425413702652874d",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
diff --git a/rdfloader/parser2v2/parse_file.go b/rdfloader/parser2v2/parse_file.go
index 485aeba..2264eb8 100644
--- a/rdfloader/parser2v2/parse_file.go
+++ b/rdfloader/parser2v2/parse_file.go
@@ -131,15 +131,15 @@ func (parser *rdfParser2_2) setFileChecksumFromNode(file *spdx.File2_2, checksum
 		return fmt.Errorf("error parsing checksumNode of a file: %v", err)
 	}
 	if file.FileChecksums == nil {
-		file.FileChecksums = map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{}
+		file.FileChecksums = map[spdx.ChecksumAlgorithm]spdx.Checksum{}
 	}
 	switch checksumAlgorithm {
 	case spdx.MD5:
-		file.FileChecksums[spdx.MD5] = spdx.Checksum2_2{Algorithm: spdx.MD5, Value: checksumValue}
+		file.FileChecksums[spdx.MD5] = spdx.Checksum{Algorithm: spdx.MD5, Value: checksumValue}
 	case spdx.SHA1:
-		file.FileChecksums[spdx.SHA1] = spdx.Checksum2_2{Algorithm: spdx.SHA1, Value: checksumValue}
+		file.FileChecksums[spdx.SHA1] = spdx.Checksum{Algorithm: spdx.SHA1, Value: checksumValue}
 	case spdx.SHA256:
-		file.FileChecksums[spdx.SHA256] = spdx.Checksum2_2{Algorithm: spdx.SHA256, Value: checksumValue}
+		file.FileChecksums[spdx.SHA256] = spdx.Checksum{Algorithm: spdx.SHA256, Value: checksumValue}
 	case "":
 		return fmt.Errorf("empty checksum algorithm and value")
 	default:
diff --git a/rdfloader/parser2v2/parse_package.go b/rdfloader/parser2v2/parse_package.go
index 02dd251..19e2ee6 100644
--- a/rdfloader/parser2v2/parse_package.go
+++ b/rdfloader/parser2v2/parse_package.go
@@ -302,15 +302,15 @@ func (parser *rdfParser2_2) setPackageChecksum(pkg *spdx.Package2_2, node *gordf
 		return fmt.Errorf("error getting checksum algorithm and value from %v", node)
 	}
 	if pkg.PackageChecksums == nil {
-		pkg.PackageChecksums = make(map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2)
+		pkg.PackageChecksums = make(map[spdx.ChecksumAlgorithm]spdx.Checksum)
 	}
 	switch checksumAlgorithm {
 	case spdx.MD5:
-		pkg.PackageChecksums[spdx.MD5] = spdx.Checksum2_2{Algorithm: spdx.MD5, Value: checksumValue}
+		pkg.PackageChecksums[spdx.MD5] = spdx.Checksum{Algorithm: spdx.MD5, Value: checksumValue}
 	case spdx.SHA1:
-		pkg.PackageChecksums[spdx.SHA1] = spdx.Checksum2_2{Algorithm: spdx.SHA1, Value: checksumValue}
+		pkg.PackageChecksums[spdx.SHA1] = spdx.Checksum{Algorithm: spdx.SHA1, Value: checksumValue}
 	case spdx.SHA256:
-		pkg.PackageChecksums[spdx.SHA256] = spdx.Checksum2_2{Algorithm: spdx.SHA256, Value: checksumValue}
+		pkg.PackageChecksums[spdx.SHA256] = spdx.Checksum{Algorithm: spdx.SHA256, Value: checksumValue}
 	default:
 		return fmt.Errorf("unknown checksumAlgorithm %s while parsing a package", checksumAlgorithm)
 	}
diff --git a/spdx/checksum.go b/spdx/checksum.go
index b689ff8..872aee2 100644
--- a/spdx/checksum.go
+++ b/spdx/checksum.go
@@ -3,24 +3,24 @@
 package spdx
 
 // ChecksumAlgorithm2_2 represents the algorithm used to generate the file checksum in the Checksum2_2 struct.
-type ChecksumAlgorithm2_2 string
+type ChecksumAlgorithm string
 
 // The checksum algorithms mentioned in the spdxv2.2.0 https://spdx.github.io/spdx-spec/4-file-information/#44-file-checksum
 const (
-	SHA224 ChecksumAlgorithm2_2 = "SHA224"
-	SHA1                        = "SHA1"
-	SHA256                      = "SHA256"
-	SHA384                      = "SHA384"
-	SHA512                      = "SHA512"
-	MD2                         = "MD2"
-	MD4                         = "MD4"
-	MD5                         = "MD5"
-	MD6                         = "MD6"
+	SHA224 ChecksumAlgorithm = "SHA224"
+	SHA1                     = "SHA1"
+	SHA256                   = "SHA256"
+	SHA384                   = "SHA384"
+	SHA512                   = "SHA512"
+	MD2                      = "MD2"
+	MD4                      = "MD4"
+	MD5                      = "MD5"
+	MD6                      = "MD6"
 )
 
 //Checksum2_2 struct Provide a unique identifier to match analysis information on each specific file in a package.
 // The Algorithm field describes the ChecksumAlgorithm2_2 used and the Value represents the file checksum
-type Checksum2_2 struct {
-	Algorithm ChecksumAlgorithm2_2
+type Checksum struct {
+	Algorithm ChecksumAlgorithm
 	Value     string
 }
diff --git a/spdx/file.go b/spdx/file.go
index bb3bcdd..1ec3202 100644
--- a/spdx/file.go
+++ b/spdx/file.go
@@ -105,11 +105,8 @@ type File2_2 struct {
 
 	// 4.4: File Checksum: may have keys for SHA1, SHA256 and/or MD5
 	// Cardinality: mandatory, one SHA1, others may be optionally provided
-	// FileChecksumSHA1   string
-	// FileChecksumSHA256 string
-	// FileChecksumMD5    string
 
-	FileChecksums map[ChecksumAlgorithm2_2]Checksum2_2
+	FileChecksums map[ChecksumAlgorithm]Checksum
 
 	// 4.5: Concluded License: SPDX License Expression, "NONE" or "NOASSERTION"
 	// Cardinality: mandatory, one
diff --git a/spdx/package.go b/spdx/package.go
index 9ad9317..953c9db 100644
--- a/spdx/package.go
+++ b/spdx/package.go
@@ -192,10 +192,8 @@ type Package2_2 struct {
 
 	// 3.10: Package Checksum: may have keys for SHA1, SHA256 and/or MD5
 	// Cardinality: optional, one or many
-	// PackageChecksumSHA1   string
-	// PackageChecksumSHA256 string
-	// PackageChecksumMD5    string
-	PackageChecksums map[ChecksumAlgorithm2_2]Checksum2_2
+
+	PackageChecksums map[ChecksumAlgorithm]Checksum
 
 	// 3.11: Package Home Page
 	// Cardinality: optional, one
diff --git a/tvloader/parser2v2/parse_file.go b/tvloader/parser2v2/parse_file.go
index c0e3c26..8151a6e 100644
--- a/tvloader/parser2v2/parse_file.go
+++ b/tvloader/parser2v2/parse_file.go
@@ -59,15 +59,15 @@ func (parser *tvParser2_2) parsePairFromFile2_2(tag string, value string) error
 			return err
 		}
 		if parser.file.FileChecksums == nil {
-			parser.file.FileChecksums = map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{}
+			parser.file.FileChecksums = map[spdx.ChecksumAlgorithm]spdx.Checksum{}
 		}
 		switch subkey {
 		case spdx.SHA1:
-			parser.file.FileChecksums[spdx.SHA1] = spdx.Checksum2_2{Algorithm: spdx.SHA1, Value: subvalue}
+			parser.file.FileChecksums[spdx.SHA1] = spdx.Checksum{Algorithm: spdx.SHA1, Value: subvalue}
 		case spdx.SHA256:
-			parser.file.FileChecksums[spdx.SHA256] = spdx.Checksum2_2{Algorithm: spdx.SHA256, Value: subvalue}
+			parser.file.FileChecksums[spdx.SHA256] = spdx.Checksum{Algorithm: spdx.SHA256, Value: subvalue}
 		case spdx.MD5:
-			parser.file.FileChecksums[spdx.MD5] = spdx.Checksum2_2{Algorithm: spdx.MD5, Value: subvalue}
+			parser.file.FileChecksums[spdx.MD5] = spdx.Checksum{Algorithm: spdx.MD5, Value: subvalue}
 		default:
 			return fmt.Errorf("got unknown checksum type %s", subkey)
 		}
diff --git a/tvloader/parser2v2/parse_package.go b/tvloader/parser2v2/parse_package.go
index 32a6aca..e7d86dc 100644
--- a/tvloader/parser2v2/parse_package.go
+++ b/tvloader/parser2v2/parse_package.go
@@ -101,15 +101,15 @@ func (parser *tvParser2_2) parsePairFromPackage2_2(tag string, value string) err
 			return err
 		}
 		if parser.pkg.PackageChecksums == nil {
-			parser.pkg.PackageChecksums = make(map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2, 9)
+			parser.pkg.PackageChecksums = make(map[spdx.ChecksumAlgorithm]spdx.Checksum, 9)
 		}
 		switch subkey {
 		case spdx.SHA1:
-			parser.pkg.PackageChecksums[spdx.SHA1] = spdx.Checksum2_2{Algorithm: spdx.SHA1, Value: subvalue}
+			parser.pkg.PackageChecksums[spdx.SHA1] = spdx.Checksum{Algorithm: spdx.SHA1, Value: subvalue}
 		case spdx.SHA256:
-			parser.pkg.PackageChecksums[spdx.SHA256] = spdx.Checksum2_2{Algorithm: spdx.SHA256, Value: subvalue}
+			parser.pkg.PackageChecksums[spdx.SHA256] = spdx.Checksum{Algorithm: spdx.SHA256, Value: subvalue}
 		case spdx.MD5:
-			parser.pkg.PackageChecksums[spdx.MD5] = spdx.Checksum2_2{Algorithm: spdx.MD5, Value: subvalue}
+			parser.pkg.PackageChecksums[spdx.MD5] = spdx.Checksum{Algorithm: spdx.MD5, Value: subvalue}
 		default:
 			return fmt.Errorf("got unknown checksum type %s", subkey)
 		}
diff --git a/tvsaver/saver2v2/save_document_test.go b/tvsaver/saver2v2/save_document_test.go
index 3656504..e6674a1 100644
--- a/tvsaver/saver2v2/save_document_test.go
+++ b/tvsaver/saver2v2/save_document_test.go
@@ -29,9 +29,8 @@ func TestSaver2_2DocumentSavesText(t *testing.T) {
 	f1 := &spdx.File2_2{
 		FileName:           "/tmp/whatever1.txt",
 		FileSPDXIdentifier: spdx.ElementID("File1231"),
-		// FileChecksumSHA1:   "85ed0817af83a24ad8da68c2b5094de69833983c",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983c",
 			},
@@ -44,9 +43,8 @@ func TestSaver2_2DocumentSavesText(t *testing.T) {
 	f2 := &spdx.File2_2{
 		FileName:           "/tmp/whatever2.txt",
 		FileSPDXIdentifier: spdx.ElementID("File1232"),
-		// FileChecksumSHA1:   "85ed0817af83a24ad8da68c2b5094de69833983d",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983d",
 			},
@@ -83,9 +81,8 @@ func TestSaver2_2DocumentSavesText(t *testing.T) {
 	f3 := &spdx.File2_2{
 		FileName:           "/tmp/file-with-snippets.txt",
 		FileSPDXIdentifier: spdx.ElementID("FileHasSnippets"),
-		// FileChecksumSHA1:   "85ed0817af83a24ad8da68c2b5094de69833983e",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983e",
 			},
@@ -107,9 +104,8 @@ func TestSaver2_2DocumentSavesText(t *testing.T) {
 	f4 := &spdx.File2_2{
 		FileName:           "/tmp/another-file.txt",
 		FileSPDXIdentifier: spdx.ElementID("FileAnother"),
-		// FileChecksumSHA1:   "85ed0817af83a24ad8da68c2b5094de69833983f",
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983f",
 			},
diff --git a/tvsaver/saver2v2/save_file_test.go b/tvsaver/saver2v2/save_file_test.go
index 0ee8374..070efc6 100644
--- a/tvsaver/saver2v2/save_file_test.go
+++ b/tvsaver/saver2v2/save_file_test.go
@@ -18,16 +18,16 @@ func TestSaver2_2FileSavesText(t *testing.T) {
 			"TEXT",
 			"DOCUMENTATION",
 		},
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983c",
 			},
-			spdx.SHA256: spdx.Checksum2_2{
+			spdx.SHA256: spdx.Checksum{
 				Algorithm: spdx.SHA256,
 				Value:     "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd",
 			},
-			spdx.MD5: spdx.Checksum2_2{
+			spdx.MD5: spdx.Checksum{
 				Algorithm: spdx.MD5,
 				Value:     "624c1abb3664f4b35547e7c73864ad24",
 			},
@@ -145,8 +145,8 @@ func TestSaver2_2FileSavesSnippetsAlso(t *testing.T) {
 	f := &spdx.File2_2{
 		FileName:           "/tmp/whatever.txt",
 		FileSPDXIdentifier: spdx.ElementID("File123"),
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983c",
 			},
@@ -200,8 +200,8 @@ func TestSaver2_2FileOmitsOptionalFieldsIfEmpty(t *testing.T) {
 	f := &spdx.File2_2{
 		FileName:           "/tmp/whatever.txt",
 		FileSPDXIdentifier: spdx.ElementID("File123"),
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983c",
 			},
@@ -242,8 +242,8 @@ func TestSaver2_2FileWrapsCopyrightMultiLine(t *testing.T) {
 	f := &spdx.File2_2{
 		FileName:           "/tmp/whatever.txt",
 		FileSPDXIdentifier: spdx.ElementID("File123"),
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983c",
 			},
diff --git a/tvsaver/saver2v2/save_package_test.go b/tvsaver/saver2v2/save_package_test.go
index 8a10d02..bfca9e0 100644
--- a/tvsaver/saver2v2/save_package_test.go
+++ b/tvsaver/saver2v2/save_package_test.go
@@ -59,16 +59,16 @@ func TestSaver2_2PackageSavesTextCombo1(t *testing.T) {
 		IsFilesAnalyzedTagPresent:           true,
 		PackageVerificationCode:             "0123456789abcdef0123456789abcdef01234567",
 		PackageVerificationCodeExcludedFile: "p1-0.1.0.spdx",
-		PackageChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		PackageChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983c",
 			},
-			spdx.SHA256: spdx.Checksum2_2{
+			spdx.SHA256: spdx.Checksum{
 				Algorithm: spdx.SHA256,
 				Value:     "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd",
 			},
-			spdx.MD5: spdx.Checksum2_2{
+			spdx.MD5: spdx.Checksum{
 				Algorithm: spdx.MD5,
 				Value:     "624c1abb3664f4b35547e7c73864ad24",
 			},
@@ -162,16 +162,16 @@ func TestSaver2_2PackageSavesTextCombo2(t *testing.T) {
 		FilesAnalyzed:                 true,
 		IsFilesAnalyzedTagPresent:     false,
 		PackageVerificationCode:       "0123456789abcdef0123456789abcdef01234567",
-		PackageChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		PackageChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983c",
 			},
-			spdx.SHA256: spdx.Checksum2_2{
+			spdx.SHA256: spdx.Checksum{
 				Algorithm: spdx.SHA256,
 				Value:     "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd",
 			},
-			spdx.MD5: spdx.Checksum2_2{
+			spdx.MD5: spdx.Checksum{
 				Algorithm: spdx.MD5,
 				Value:     "624c1abb3664f4b35547e7c73864ad24",
 			},
@@ -255,16 +255,16 @@ func TestSaver2_2PackageSavesTextCombo3(t *testing.T) {
 		// NOTE that verification code MUST be omitted from output
 		// since FilesAnalyzed is false
 		PackageVerificationCode: "0123456789abcdef0123456789abcdef01234567",
-		PackageChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		PackageChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983c",
 			},
-			spdx.SHA256: spdx.Checksum2_2{
+			spdx.SHA256: spdx.Checksum{
 				Algorithm: spdx.SHA256,
 				Value:     "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd",
 			},
-			spdx.MD5: spdx.Checksum2_2{
+			spdx.MD5: spdx.Checksum{
 				Algorithm: spdx.MD5,
 				Value:     "624c1abb3664f4b35547e7c73864ad24",
 			},
@@ -386,8 +386,8 @@ func TestSaver2_2PackageSavesFilesIfPresent(t *testing.T) {
 	f1 := &spdx.File2_2{
 		FileName:           "/tmp/whatever1.txt",
 		FileSPDXIdentifier: spdx.ElementID("File1231"),
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983c",
 			},
@@ -401,8 +401,8 @@ func TestSaver2_2PackageSavesFilesIfPresent(t *testing.T) {
 	f2 := &spdx.File2_2{
 		FileName:           "/tmp/whatever2.txt",
 		FileSPDXIdentifier: spdx.ElementID("File1232"),
-		FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-			spdx.SHA1: spdx.Checksum2_2{
+		FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+			spdx.SHA1: spdx.Checksum{
 				Algorithm: spdx.SHA1,
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983d",
 			},
diff --git a/utils/verification_test.go b/utils/verification_test.go
index 10177bd..c6fa3f9 100644
--- a/utils/verification_test.go
+++ b/utils/verification_test.go
@@ -120,8 +120,8 @@ func TestPackage2_2CanGetVerificationCode(t *testing.T) {
 		"File0": &spdx.File2_2{
 			FileName:           "file2.txt",
 			FileSPDXIdentifier: "File0",
-			FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-				spdx.SHA1: spdx.Checksum2_2{
+			FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+				spdx.SHA1: spdx.Checksum{
 					Algorithm: spdx.SHA1,
 					Value:     "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd",
 				},
@@ -130,8 +130,8 @@ func TestPackage2_2CanGetVerificationCode(t *testing.T) {
 		"File1": &spdx.File2_2{
 			FileName:           "file1.txt",
 			FileSPDXIdentifier: "File1",
-			FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-				spdx.SHA1: spdx.Checksum2_2{
+			FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+				spdx.SHA1: spdx.Checksum{
 					Algorithm: spdx.SHA1,
 					Value:     "3333333333bbbbbbbbbbccccccccccdddddddddd",
 				},
@@ -140,8 +140,8 @@ func TestPackage2_2CanGetVerificationCode(t *testing.T) {
 		"File2": &spdx.File2_2{
 			FileName:           "file3.txt",
 			FileSPDXIdentifier: "File2",
-			FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-				spdx.SHA1: spdx.Checksum2_2{
+			FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+				spdx.SHA1: spdx.Checksum{
 					Algorithm: spdx.SHA1,
 					Value:     "8888888888bbbbbbbbbbccccccccccdddddddddd",
 				},
@@ -150,8 +150,8 @@ func TestPackage2_2CanGetVerificationCode(t *testing.T) {
 		"File3": &spdx.File2_2{
 			FileName:           "file5.txt",
 			FileSPDXIdentifier: "File3",
-			FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-				spdx.SHA1: spdx.Checksum2_2{
+			FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+				spdx.SHA1: spdx.Checksum{
 					Algorithm: spdx.SHA1,
 					Value:     "2222222222bbbbbbbbbbccccccccccdddddddddd",
 				},
@@ -160,8 +160,8 @@ func TestPackage2_2CanGetVerificationCode(t *testing.T) {
 		"File4": &spdx.File2_2{
 			FileName:           "file4.txt",
 			FileSPDXIdentifier: "File4",
-			FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-				spdx.SHA1: spdx.Checksum2_2{
+			FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+				spdx.SHA1: spdx.Checksum{
 					Algorithm: spdx.SHA1,
 					Value:     "bbbbbbbbbbccccccccccddddddddddaaaaaaaaaa",
 				},
@@ -186,8 +186,8 @@ func TestPackage2_2CanGetVerificationCodeIgnoringExcludesFile(t *testing.T) {
 		spdx.ElementID("File0"): &spdx.File2_2{
 			FileName:           "file1.txt",
 			FileSPDXIdentifier: "File0",
-			FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-				spdx.SHA1: spdx.Checksum2_2{
+			FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+				spdx.SHA1: spdx.Checksum{
 					Algorithm: spdx.SHA1,
 					Value:     "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd",
 				},
@@ -196,8 +196,8 @@ func TestPackage2_2CanGetVerificationCodeIgnoringExcludesFile(t *testing.T) {
 		spdx.ElementID("File1"): &spdx.File2_2{
 			FileName:           "file2.txt",
 			FileSPDXIdentifier: "File1",
-			FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-				spdx.SHA1: spdx.Checksum2_2{
+			FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+				spdx.SHA1: spdx.Checksum{
 					Algorithm: spdx.SHA1,
 					Value:     "3333333333bbbbbbbbbbccccccccccdddddddddd",
 				},
@@ -206,8 +206,8 @@ func TestPackage2_2CanGetVerificationCodeIgnoringExcludesFile(t *testing.T) {
 		spdx.ElementID("File2"): &spdx.File2_2{
 			FileName:           "thisfile.spdx",
 			FileSPDXIdentifier: "File2",
-			FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-				spdx.SHA1: spdx.Checksum2_2{
+			FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+				spdx.SHA1: spdx.Checksum{
 					Algorithm: spdx.SHA1,
 					Value:     "bbbbbbbbbbccccccccccddddddddddaaaaaaaaaa",
 				},
@@ -216,8 +216,8 @@ func TestPackage2_2CanGetVerificationCodeIgnoringExcludesFile(t *testing.T) {
 		spdx.ElementID("File3"): &spdx.File2_2{
 			FileName:           "file3.txt",
 			FileSPDXIdentifier: "File3",
-			FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-				spdx.SHA1: spdx.Checksum2_2{
+			FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+				spdx.SHA1: spdx.Checksum{
 					Algorithm: spdx.SHA1,
 					Value:     "8888888888bbbbbbbbbbccccccccccdddddddddd",
 				},
@@ -226,8 +226,8 @@ func TestPackage2_2CanGetVerificationCodeIgnoringExcludesFile(t *testing.T) {
 		spdx.ElementID("File4"): &spdx.File2_2{
 			FileName:           "file4.txt",
 			FileSPDXIdentifier: "File4",
-			FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-				spdx.SHA1: spdx.Checksum2_2{
+			FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+				spdx.SHA1: spdx.Checksum{
 					Algorithm: spdx.SHA1,
 					Value:     "2222222222bbbbbbbbbbccccccccccdddddddddd",
 				},
@@ -252,8 +252,8 @@ func TestPackage2_2GetVerificationCodeFailsIfNilFileInSlice(t *testing.T) {
 		spdx.ElementID("File0"): &spdx.File2_2{
 			FileName:           "file2.txt",
 			FileSPDXIdentifier: "File0",
-			FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-				spdx.SHA1: spdx.Checksum2_2{
+			FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+				spdx.SHA1: spdx.Checksum{
 					Algorithm: spdx.SHA1,
 					Value:     "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd",
 				},
@@ -263,8 +263,8 @@ func TestPackage2_2GetVerificationCodeFailsIfNilFileInSlice(t *testing.T) {
 		spdx.ElementID("File2"): &spdx.File2_2{
 			FileName:           "file3.txt",
 			FileSPDXIdentifier: "File2",
-			FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{
-				spdx.SHA1: spdx.Checksum2_2{
+			FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{
+				spdx.SHA1: spdx.Checksum{
 					Algorithm: spdx.SHA1,
 					Value:     "8888888888bbbbbbbbbbccccccccccdddddddddd",
 				},