diff --git a/configs/config.json.cluster.example b/configs/config.json.cluster.example
index a1df5cdedc..5613061a84 100644
--- a/configs/config.json.cluster.example
+++ b/configs/config.json.cluster.example
@@ -21,12 +21,15 @@
         "type": "TransferPokemon"
       },
       {
-        "type": "EvolveAll",
+        "type": "EvolvePokemon",
         "config": {
-          "evolve_all": "NONE",
-          "evolve_cp_min": 300,
-          "evolve_speed": 20,
-          "use_lucky_egg": false
+            "evolve_all": "none",
+            "first_evolve_by": "cp",
+            "evolve_above_cp": 500,
+            "evolve_above_iv": 0.8,
+            "logic": "or",
+            "evolve_speed": 20,
+            "use_lucky_egg": false
         }
       },
       {
diff --git a/configs/config.json.example b/configs/config.json.example
index b3c68dc9f0..20ef72e34e 100644
--- a/configs/config.json.example
+++ b/configs/config.json.example
@@ -21,7 +21,7 @@
         "type": "TransferPokemon"
       },
       {
-        "type": "EvolveAll",
+        "type": "EvolvePokemon",
         "config": {
             "evolve_all": "none",
             "first_evolve_by": "cp",
diff --git a/configs/config.json.path.example b/configs/config.json.path.example
index 0857e77fc9..38baa9f1f0 100644
--- a/configs/config.json.path.example
+++ b/configs/config.json.path.example
@@ -21,12 +21,15 @@
         "type": "TransferPokemon"
       },
       {
-        "type": "EvolveAll",
+        "type": "EvolvePokemon",
         "config": {
-          "evolve_all": "NONE",
-          "evolve_cp_min": 300,
-          "evolve_speed": 20,
-          "use_lucky_egg": false
+            "evolve_all": "none",
+            "first_evolve_by": "cp",
+            "evolve_above_cp": 500,
+            "evolve_above_iv": 0.8,
+            "logic": "or",
+            "evolve_speed": 20,
+            "use_lucky_egg": false
         }
       },
       {
diff --git a/configs/config.json.pokemon.example b/configs/config.json.pokemon.example
index b1e6aa939b..f0b5990956 100644
--- a/configs/config.json.pokemon.example
+++ b/configs/config.json.pokemon.example
@@ -21,12 +21,15 @@
         "type": "TransferPokemon"
       },
       {
-        "type": "EvolveAll",
+        "type": "EvolvePokemon",
         "config": {
-          "evolve_all": "NONE",
-          "evolve_cp_min": 300,
-          "evolve_speed": 20,
-          "use_lucky_egg": false
+            "evolve_all": "none",
+            "first_evolve_by": "cp",
+            "evolve_above_cp": 500,
+            "evolve_above_iv": 0.8,
+            "logic": "or",
+            "evolve_speed": 20,
+            "use_lucky_egg": false
         }
       },
       {
diff --git a/pokemongo_bot/cell_workers/__init__.py b/pokemongo_bot/cell_workers/__init__.py
index f8b4afc261..32ea909c5c 100644
--- a/pokemongo_bot/cell_workers/__init__.py
+++ b/pokemongo_bot/cell_workers/__init__.py
@@ -2,7 +2,7 @@
 
 from catch_lured_pokemon import CatchLuredPokemon
 from catch_visible_pokemon import CatchVisiblePokemon
-from evolve_all import EvolveAll
+from evolve_pokemon import EvolvePokemon
 from incubate_eggs import IncubateEggs
 from move_to_fort import MoveToFort
 from nickname_pokemon import NicknamePokemon
diff --git a/pokemongo_bot/cell_workers/evolve_all.py b/pokemongo_bot/cell_workers/evolve_pokemon.py
similarity index 99%
rename from pokemongo_bot/cell_workers/evolve_all.py
rename to pokemongo_bot/cell_workers/evolve_pokemon.py
index c7950bb461..da09ad407f 100644
--- a/pokemongo_bot/cell_workers/evolve_all.py
+++ b/pokemongo_bot/cell_workers/evolve_pokemon.py
@@ -3,7 +3,7 @@
 from pokemongo_bot.item_list import Item
 from pokemongo_bot.cell_workers.base_task import BaseTask
 
-class EvolveAll(BaseTask):
+class EvolvePokemon(BaseTask):
     def initialize(self):
         self.api = self.bot.api
         self.evolve_all = self.config.get('evolve_all', [])