Minor

Mainly name changes