Fix some name to meet naming rule.