naming convention

should respect the naming convention
code readability