renamed some directives