Remove outdated 'wp' prefix from form

Change-Id: Iae07b7c441aab735ff6600d3d36190b21b941bdc