[SO] Change sub component names