some small name changes