Update PreferenceCleaner for new naming conventions
Merge pull request #1596 from Cottser/preferencecleaner

Update PreferenceCleaner for new naming conventions