use freshNames in macroses
 refactoring macroses structure to affect all types of selectors.