Old schoolers used the term electronica as the umbrella. But eventually electronica shifted to replace "IDM" (intelligent dance music) to mean very electronica-ish music.

EDM became a term as EDM went mainstream, starting around 2010. It defines a specific range known for the commercially well-produced electro/progressive house, dubstep, & trap.

From the outside, EDM is technically correct. But for insiders, we probably just say "dance music" or "electronic music" as the umbrella.

EDM is a specific subgenre of electronic music that became popular in the 2010s with Skrillex and those big mainstream American festivals.

The most general term would be 'electronic music', or 'dance music', but not 'electronic dance music'.

Similarly, if you say 'dubstep' to a person in the UK they would think of something like this https://www.youtube.com/watch?v=DHRf9DNdkgY while an American would think of something terrible. (Good track for this discussion about bass, incidentally).

'Garage' is another one. Totally different genres in the UK and US.

if someone points it out I generally just say, we get it, you like neuro-funk jungle house and don't want it lumped in with other genres.

In my experience "EDM" fans will skew more towards newer genre's of electronic music.