Minor update

A few name changes