Golf is golf......anytime you try to hit something with an object in as few shots possible, your golfing...
when you talk to people that golf with the same object as you, you can usually just say golf..
when talking about the 2 sports, i always say disc golf for our sport (1. everyone needs to call it by its real name so those unfamilair can be in the know. 2. Frolf is inaccurate due to Whammos ownership and application to a specific model disc,forever ruining of the word frisbee for ULTIMATE players and DGer's. 3. frolf sounds dumb and i think demeans(?) our sport)
and i usually say ball golf to describe the other popular form of the sport, but I like/try/prefer to call it Traditional Golf and then say something like, "you know, golf like what tiger woods plays, with a club and ball"
I think Traditional Golf pays homage to the history and popularity of the mother sport...