Yes, they are both interchangeable, I have a gen 1 and gen 2, and swapped them numerous times for testing. If you have a gen 1 (Which I prefer, because the bolt is easily removed, in order to clean the barrel properly, unlike a gen 2), you might want to try a new Marauder barrel from the factory. They have retooled their rifling facilities, and changed the way they produce those barrels, for the better.
Assistant Match Director
Eastern Suffolk Competitive Airgunners Association
Long Island NY