I have decided to re-frame 'discipline' as 'courage'
If Courage is doing something that you don't really want to do because it is the RIGHT thing to do... then it is not far off from discipline where you do something that is the RIGHT thing to do even if you may not want to do it.
So, from now on, it takes "courage" to choose good habits, not discipline.
Being courageous sounds more fun than being disciplined.
Don't get me wrong the Courage that soldiers and firefighters and police officers display is way bigger... like VALOR.