Some renames to comply to prefsEditor conventions.