Made some small name changes