refine naming convention