It is production, but DJing has come to be used to describe both things, at least in California. The line is especially blurred because a lot of popular electronic producers perform live, which ranges from anything to mixing music in real time to playing pre-produced tracks, both of which resemble traditional DJing.