Some renaming of directives