Components name fix for FormDesigner.

Components name fixes for FrmDsgner