Minor name changes