Refine naming