OK I've made the necessary changes to bring Commercial Yard into accordance with the National Street Gazetteer. It wasn't as scary as I thought it would be (my first edit). I hope this change ripples through to the SatNavs OK.