Change naming scheme for macros to use the macro name
Change naming scheme for macros to use the macro name

mirah/mirah,mirah/mirah,felixvf/mirah,felixvf/mirah,felixvf/mirah,mirah/mirah,felixvf/mirah,mirah/mirah