Yeah, just music. I have heard people use song to mean any music before, though, so it's probably something I have to deal with. I do like some songs but 90% of the music I listen to is comprised of either tracks/records (electronic music) or pieces (classical).