Slight naming improvement