Feature/change name