Renamed directive to better suit purpose
Completed refactoring of tag directives