replace HPC and RR service objects with the right ones