Renames macro scope and filter macro methods