Patrick made very good points, but as best as I know the WWI plants did not swap anything. They were direct competition with each other and did no swapping. After WWI SA did a huge re-build program and many parts were swapped out in the early 1920/22 timeframe. WWII then saw parts swapping again, so "correcting" an M1917 is just fine by me.