Merge "Unify the caption preference class naming"