Finish rename of app and fix history issue