Merge "Use renamed Wps class"