Refine naming and fix compile warning