Refactor Appname