Changed activity names to Activity_'activity_name' to keep it standard