More clear naming in app package