Renamed defines: added __r_ prefix

PR to #224