Renamed apps to app
Added app states and enforced rename pf apps to app