[#1010] Consistently use survey and form domain language