Changed form keys to interface with backend forms