Adding names that actually reflect the app