Some small name changes