diff --git a/src/file_analysis/analyzer/hash/Hash.cc b/src/file_analysis/analyzer/hash/Hash.cc
index 94c110373c..f553577a61 100644
--- a/src/file_analysis/analyzer/hash/Hash.cc
+++ b/src/file_analysis/analyzer/hash/Hash.cc
@@ -11,10 +11,14 @@
 namespace zeek::file_analysis::detail
 	{
 
-Hash::Hash(RecordValPtr args, file_analysis::File* file, HashVal* hv, const char* arg_kind)
-	: file_analysis::Analyzer(file_mgr->GetComponentTag(util::to_upper(arg_kind).c_str()),
+StringValPtr MD5::kind_val = make_intrusive<StringVal>("md5");
+StringValPtr SHA1::kind_val = make_intrusive<StringVal>("sha1");
+StringValPtr SHA256::kind_val = make_intrusive<StringVal>("sha256");
+
+Hash::Hash(RecordValPtr args, file_analysis::File* file, HashVal* hv, StringValPtr arg_kind)
+	: file_analysis::Analyzer(file_mgr->GetComponentTag(util::to_upper(arg_kind->ToStdString())),
                               std::move(args), file),
-	  hash(hv), fed(false), kind(arg_kind)
+	  hash(hv), fed(false), kind(std::move(arg_kind))
 	{
 	hash->Init();
 	}
@@ -55,7 +59,7 @@ void Hash::Finalize()
 	if ( ! file_hash )
 		return;
 
-	event_mgr.Enqueue(file_hash, GetFile()->ToVal(), make_intrusive<StringVal>(kind), hash->Get());
+	event_mgr.Enqueue(file_hash, GetFile()->ToVal(), kind, hash->Get());
 	}
 
 	} // namespace zeek::file_analysis::detail
diff --git a/src/file_analysis/analyzer/hash/Hash.h b/src/file_analysis/analyzer/hash/Hash.h
index 9abdd07df7..8958a94d23 100644
--- a/src/file_analysis/analyzer/hash/Hash.h
+++ b/src/file_analysis/analyzer/hash/Hash.h
@@ -55,7 +55,7 @@ protected:
 	 * @param hv specific hash calculator object.
 	 * @param kind human readable name of the hash algorithm to use.
 	 */
-	Hash(RecordValPtr args, file_analysis::File* file, HashVal* hv, const char* kind);
+	Hash(RecordValPtr args, file_analysis::File* file, HashVal* hv, StringValPtr kind);
 
 	/**
 	 * If some file contents have been seen, finalizes the hash of them and
@@ -66,13 +66,13 @@ protected:
 private:
 	HashVal* hash;
 	bool fed;
-	const char* kind;
+	StringValPtr kind;
 	};
 
 /**
  * An analyzer to produce an MD5 hash of file contents.
  */
-class MD5 : public Hash
+class MD5 final : public Hash
 	{
 public:
 	/**
@@ -87,22 +87,24 @@ public:
 		return file_hash ? new MD5(std::move(args), file) : nullptr;
 		}
 
-protected:
+private:
 	/**
 	 * Constructor.
 	 * @param args the \c AnalyzerArgs value which represents the analyzer.
 	 * @param file the file to which the analyzer will be attached.
 	 */
 	MD5(RecordValPtr args, file_analysis::File* file)
-		: Hash(std::move(args), file, new MD5Val(), "md5")
+		: Hash(std::move(args), file, new MD5Val(), MD5::kind_val)
 		{
 		}
+
+	static StringValPtr kind_val;
 	};
 
 /**
  * An analyzer to produce a SHA1 hash of file contents.
  */
-class SHA1 : public Hash
+class SHA1 final : public Hash
 	{
 public:
 	/**
@@ -117,22 +119,24 @@ public:
 		return file_hash ? new SHA1(std::move(args), file) : nullptr;
 		}
 
-protected:
+private:
 	/**
 	 * Constructor.
 	 * @param args the \c AnalyzerArgs value which represents the analyzer.
 	 * @param file the file to which the analyzer will be attached.
 	 */
 	SHA1(RecordValPtr args, file_analysis::File* file)
-		: Hash(std::move(args), file, new SHA1Val(), "sha1")
+		: Hash(std::move(args), file, new SHA1Val(), SHA1::kind_val)
 		{
 		}
+
+	static StringValPtr kind_val;
 	};
 
 /**
  * An analyzer to produce a SHA256 hash of file contents.
  */
-class SHA256 : public Hash
+class SHA256 final : public Hash
 	{
 public:
 	/**
@@ -147,16 +151,18 @@ public:
 		return file_hash ? new SHA256(std::move(args), file) : nullptr;
 		}
 
-protected:
+private:
 	/**
 	 * Constructor.
 	 * @param args the \c AnalyzerArgs value which represents the analyzer.
 	 * @param file the file to which the analyzer will be attached.
 	 */
 	SHA256(RecordValPtr args, file_analysis::File* file)
-		: Hash(std::move(args), file, new SHA256Val(), "sha256")
+		: Hash(std::move(args), file, new SHA256Val(), SHA256::kind_val)
 		{
 		}
+
+	static StringValPtr kind_val;
 	};
 
 	} // namespace zeek::file_analysis