Merge "[SO] Change sub component names"