Index: src/Tuples/TupleAssignment.cc
===================================================================
--- src/Tuples/TupleAssignment.cc	(revision 5339a87ca7689b734a2eb1d355830ea9713784a1)
+++ src/Tuples/TupleAssignment.cc	(revision b107885a0bb3bec3b818b196d6d50a598b24ca79)
@@ -504,7 +504,6 @@
 
 			std::vector< ast::ptr< ast::Expr > > match() override {
-				// temporary workaround for new and old ast to coexist and avoid name collision
-				static UniqueName lhsNamer( "__massassign_Ln" );
-				static UniqueName rhsNamer( "__massassign_Rn" );
+				static UniqueName lhsNamer( "__massassign_L" );
+				static UniqueName rhsNamer( "__massassign_R" );
 				// empty tuple case falls into this matcher
 				assert( lhs.empty() ? rhs.empty() : rhs.size() <= 1 );
@@ -535,7 +534,6 @@
 
 			std::vector< ast::ptr< ast::Expr > > match() override {
-				// temporary workaround for new and old ast to coexist and avoid name collision
-				static UniqueName lhsNamer( "__multassign_Ln" );
-				static UniqueName rhsNamer( "__multassign_Rn" );
+				static UniqueName lhsNamer( "__multassign_L" );
+				static UniqueName rhsNamer( "__multassign_R" );
 
 				if ( lhs.size() != rhs.size() ) return {};