more file renaming to get ride of myapplication2