* Change some integer type to enums
* Adjust AppName