Minor renaming. Committing before a big refactor.