Modify variable naming convention

remove "_"
modif some method signature