And both words have attracted a degree of abuse from legalistic/grace camps respectively (I think). I remember when “Desiring God” started to become popular, and Piper was roundly abused by the ultra-conservatives (Masters et al) for promoting “pleasure” – as though it was evil.

Just so – “discipline” has become an ugly word among the ultra-grace proponents (Rufus, Johnson et al supporters and fans) because of perhaps the tendency to exalt discipline in place of the gospel.

I like this tension – neither have to be abandoned – both have uses and values.