Replace custom Directory identifier with built-in