Changes directory naming scheme to be consistent with other system toos