Configs renaming, cleanup and rewording