fix ApplicationName support