More adjustments to naming