uniform dir names.
unified dir names part 2