Minor name fixes