renamed directive and module name
Fix merge conflicts
Merge branch 'rename'