Adapted new name
Added more usage