Use W' instead of AWC on CP chart

AWC is old terminology and should not be used any more.
merge master into personal