Remove some inconsistent naming, worked more on directory properties