Change naming scheme. Pun intended.