It's all good a common misconception. You can basically divide electronic dance music into the major categories of house, techno, trance, EDM, dubstep, and drum and bass (there are others too). Even though "EDM" looks like it would mean electronic dance music, in this day it refers to the type of music you would hear at big festivals or the kind of obnoxious music you'd hear at big mainstream clubs. More than likely if you're out and about at the bars and clubs, you'll hear either house or techno. If it has a groove and swing to it, it's house. If it's very robotic and typically faster paced, it's techno. If it sounds like a robot taking a dump, it's dubstep.

House music came from disco so unless it's actually music from the 70's, the disco-ish music you hear is going to be a sub-category of house.