Fix PV names on template and OPI to use the standard (with dash for set point, readout and read back PVs).