Rename form blocks