Minor name adjustments