cleanup: Adjust string keys to match naming convention, tweak strings.