Fixed customer/form block names