refactor: Better naming of directives