Index: src/Common/UniqueName.cc
===================================================================
--- src/Common/UniqueName.cc	(revision 3d9d0170b69d58d6ff9ab9c9c720c0a1697c7582)
+++ src/Common/UniqueName.cc	(revision 790d83558fed5c46c4c9acfac1cbfe1d8cccbd1a)
@@ -5,17 +5,16 @@
 // file "LICENCE" distributed with Cforall.
 //
-// UniqueName.cc -- 
+// UniqueName.cc -- Create a unique variants of a base name with a counter.
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  8 14:47:49 2015
-// Update Count     : 3
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Nov  7 15:04:00 2023
+// Update Count     : 4
 //
 
-#include <string>
-#include <sstream>
+#include "UniqueName.h"
 
-#include "UniqueName.h"
+#include "Common/ToString.hpp"
 
 UniqueName::UniqueName( const std::string &base ) : base( base ), count( 0 ) {
@@ -23,7 +22,5 @@
 
 std::string UniqueName::newName( const std::string &additional ) {
-	std::ostringstream os;
-	os << base << additional << count++;
-	return os.str();
+	return toString( base, additional, count++ );
 }
 
Index: src/Common/UniqueName.h
===================================================================
--- src/Common/UniqueName.h	(revision 3d9d0170b69d58d6ff9ab9c9c720c0a1697c7582)
+++ src/Common/UniqueName.h	(revision 790d83558fed5c46c4c9acfac1cbfe1d8cccbd1a)
@@ -5,11 +5,11 @@
 // file "LICENCE" distributed with Cforall.
 //
-// UniqueName.h -- 
+// UniqueName.h -- Create a unique variants of a base name with a counter.
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:18:45 2017
-// Update Count     : 2
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Nov  7 15:00:00 2023
+// Update Count     : 3
 //
 
@@ -19,8 +19,8 @@
 
 class UniqueName {
-  public:
-	UniqueName( const std::string &base = "" );
+public:
+	UniqueName( const std::string &base );
 	std::string newName( const std::string &additional = "" );
-  private:
+private:
 	std::string base;
 	int count;