directory naming cleanup