Merge "Replace ComponentName to InputId."