More renaming works
Add app codes