Macro renamed, added prefix