reorganized formula directives.

Use same name than directive name