My understanding is that the Great Patriotic War (Вели́кая Оте́чественная война́) is just another name for World War II (Вторая Мировая Война). However, I've also heard that the Great Patriotic War actually only refers to the Eastern Front (Восточный фронт) portion of the war. My understanding also is that the AK-47 (Автомат Калашникова) was developed during WWII. So:
1) Are the following two sentences phrased correctly?
2) Which sentence would be more likely spoken by a Russian in Russia when speaking of the history of the AK-47?
Автомат Калашникова был разработан во время Второй мировой войны.
(The Kalashnikov was developed during World War II.)
Автомат Калашникова был разработан в годы Великой Отечественной войны.
(The Kalashnikov was developed during the Great Patriotic War.)