more app name fixes
merge