Avoid using stilly "wp" prefix in form

Change-Id: I89c1b090e186fbf24f950aebc945f5907e18a853
Merge "Avoid using stilly "wp" prefix in form"