Minor name cleanup