Core/Achievements: rename some AchievementCriteriaDataTypes to keep consistent