remove code duplicate
update application name