Use 'named' for automatic disable handling and tidy up ordering