But everyone knows 'Wehrmacht' means armed forces, which is the Kriegsmarine, Luftwaffe, and Heer - which is the real word for army. For the longest time I thought the "Wehrmacht" was the standing army, but I have known for years. Ah, learning. The SS is seperate.
Wrong, the Wehrmacht is the "Defense Forces" of Nazi Germany, Bundeswehr is the Armed Forces of the Federal Republic of Germany. The Bundeswehr is divided into a military part, armed forces (Streitkräfte), and a civil part, with the armed forces administration (Wehrverwaltung). The military part of the federal defense force consists of the Heer (Army), Marine (Navy), Luftwaffe (Air Force), Streitkräftebasis (Joint Support Service), and the Zentraler Sanitätsdienst (Central Medical Services) branches.
In regards to the Wehrmacht, you are correct in that it consisted of the Heer, Luftwaffe, and Kriegsmarine.