Unify and fix titles