Update some fix for naming convention