bugid-11055 fix naming convention
bugid-11055 code quality fix