directive naming and replace option fix