improve naming convention