Reverted macro grammar name