Update application name and some refactoring