fixed the control names
Merge branch 'develop' of github.com:iNeedCode/abb-be-social into develop