slight naming updates