Change directory naming convention + base object