Fix block names in device/form