Naming Convention

Correct some type with naming convention