Minor name modifications