Minor refactoring for more consistent naming
Created App 8
App 004 updates
Various minor updates