Currently the retry and error topics for both JobQueue-ChangeProp and normal ChangeProp are prefixed with change-prop. For retry topics is not a big deal as they are separated by the actual topic name, but for the error topic all the errors from both CP instances end up in the same topic which is bad.
I propose to replace change-prop prefix with the service name, so the error/retry topics will be prefixed with changeprop and cpjobqueue.
This will break the metrics and might lead to loosing a couple of retries during the deployments, but since the traffic in retry topics is very low it's not a big deal, and the metrics is easily fixable.