Jason,
I'm sure this is becoming obvious to you as you ease back into rocketry. Motors and rockets are very interchangeable due to the standard motor diameters in use today. You'll find that Estes A-C engines are 18mm. The D's run 24mm and then the larger motors run 29mm, 38mm and end up around 54mm (and go higher from there). These sizes are from the "standard" or popular motor manufacturers like Aerotech, Estes, Quest, PML, etc.
Having been given that caveat about stronger building techniques in previous posts, you can see that mixing motor "brands" with different rockets is acceptable and widely practiced.
Once you're out of the Estes and Quest realm, you'll find rocket kit makers that make kits only, and do not sell engines. These are designed to use the "standard" motors in the sizes I mentioned. One could build a kit from, say, "The Launch Pad" and stick an Estes "D" motor in it.
So, as long as your building techniques are proper and your rocket design is correct, you can use any of the standard engine mounts and, consequently, use any of the engines out there in the rocket world. This being said without stating the obvious; that you wouldn't pair-up a tiny rocket with a huge and inappropriate engine and that safety is primary.