Rename variables and rewrite post form