Resolved combinatorial explosion due to renaming.

Renaming now stores aliases for later use.