ECMS-5522: Fix some problem relate to code convention in ECMS