Fix namespace
Update FPGA patch