Rename app name and ad
Merge branch 'rename_app_name_and_ad'