App name change and code cleanup