Minor app def changes and renames