Merge "Renamed Setting's Directory Access constants."