I think so, but at my age I'm not sure of anything anymore. :-( I Photoshop-swapped the 1-2 caps in this pic and it looks less crazy to me, but then I don't know what it's supposed to look like in the first place.
I think I need to go double-check the marks I put on those parts before I disassembled them.