c4fe8f5258
* rename macros so not to clash with others * modified macro in all samples
* rename macros so not to clash with others * modified macro in all samples