Move title saving to more natural keys.