refactor module and directive names