Revert "More renaming."

This reverts commit 53038e138d739405297e2089e2bd0c1b251720ec.