changed all directives with  prefixes