Some more combined muon wrapping fixes

This is part of my efforts to fix the differences seen with Combined Muons. To do so, I've been trying to get wrapping working again, and this is me collecting in some obvious fixes related to this.

These include some minor changes, like renaming components so old and CA configuration match better, but also one case where the concrete type was different.

I also found that some objects were missing because the config flags needed more synching.