Merge "Rename WpsConfiguration to Wps"