Directive renames and style updated.