Adding rm and name directives