Fixed peer names in filter and form generators