Add regex for method et name replacement ref #3