Fix name of app
Improve serialization consistency