Made some changes to the names of things.