Enhance: more appropriate naming