More changes

A few name changes