Change use cases WIND.UC.005 and WIND.UC.006