#13 Consistent naming of directives