Woops. Fix wrong use of constants
Tested up to WP 3.6
Merge branch 'move-to-using-constants'

* move-to-using-constants:
  Tested up to WP 3.6
  Woops. Fix wrong use of constants