A lot of changes to standardize on 'Tool', 'File' and 'Dir' suffixes for settings.