Fix name clarity