Fix application name issue