While I agree that the dance culture and media codified the terms, they are still incorrect. I recently saw Tito Puente Jr., and he still calls almost all his fathers music "mambo".
I also want to point out that Mambo, at least in the Cuban sense, is not in the Son genre.
The mambo and...