diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 7db211a97e..a70f91163e 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -366,10 +366,16 @@ void NoteData::ConvertHoldNotesTo2sAnd3s()
 }
 
 
-void NoteData::Get2sAnd3s( NoteData &out ) const
+void NoteData::To2sAnd3s( const NoteData &out )
 {
-	out.CopyAll( this );
-	out.ConvertHoldNotesTo2sAnd3s();
+	CopyAll( &out );
+	ConvertHoldNotesTo2sAnd3s();
+}
+
+void NoteData::From2sAnd3s( const NoteData &out )
+{
+	CopyAll( &out );
+	Convert2sAnd3sToHoldNotes();
 }
 
 /* "104444001" ==
diff --git a/stepmania/src/NoteData.h b/stepmania/src/NoteData.h
index 6dbcc6429c..65176c5967 100644
--- a/stepmania/src/NoteData.h
+++ b/stepmania/src/NoteData.h
@@ -130,7 +130,8 @@ public:
 	// Convert between HoldNote representation and '2' and '3' markers in TapNotes
 	void Convert2sAnd3sToHoldNotes();
 	void ConvertHoldNotesTo2sAnd3s();
-	void Get2sAnd3s( NoteData &out ) const;
+	void To2sAnd3s( const NoteData &out );
+	void From2sAnd3s( const NoteData &out );
 
 	void Convert4sToHoldNotes();
 	void ConvertHoldNotesTo4s();
diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp
index 55f6e987ed..342980128d 100644
--- a/stepmania/src/NoteDataUtil.cpp
+++ b/stepmania/src/NoteDataUtil.cpp
@@ -130,7 +130,7 @@ void NoteDataUtil::LoadFromSMNoteDataString( NoteData &out, CString sSMNoteData
 void NoteDataUtil::GetSMNoteDataString( const NoteData &in_, CString &out )
 {
 	NoteData in;
-	in_.Get2sAnd3s( in );
+	in.To2sAnd3s( in_ );
 
 	float fLastBeat = in.GetLastBeat();
 	int iLastMeasure = int( fLastBeat/BEATS_PER_MEASURE );