Gridfield formaction renaming

@sminnee @hafriedlander @stojg Same as sapphire pull request