Small tweaks on tokens and application name