Handle single quote in app name better.