Mass rename strikes back.

Still fixing bugs.