Name cleanup on 360s