diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/AltererFactory.java b/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/AltererFactory.java
index 163980598ed5cda052206928699f53ff6caf284c..bc094066f3bc5b62824fddf67392392e8eed6712 100644
--- a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/AltererFactory.java
+++ b/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/AltererFactory.java
@@ -43,41 +43,41 @@ public class AltererFactory {
 
 		switch(name) {
 			//case "CompositeAlterer": return createCompositeAlterer(config);
-			case "mean_alterer": return createMeanAlterer(config);
-			case "correlation_mean_alterer": return (Alterer<G, FitnessValue>) createCorrelationMeanAlterer(config);
-			case "partial_matched_alterer": return createPartiallyMatchedAlterer(config);
-			case "correlation_partial_matched_alterer": return createCorrelationPartiallyMatchedAlterer(config);
-
-			case "gaussian_mutator": return createGaussianMutator(config);
-			case "correlation_gaussian_mutator": return createGaussianCorrelationMutator(config);
-			case "swap_mutator": return createSwapMutator(config);
-			case "correlation_swap_mutator": return createCorrelationSwapMutator(config);
-			case "bit_flip_mutator": return createBitFlipMutator(config);
-			case "correlation_bit_flip_mutator": return createCorrelationBitFlipMutator(config);
+			case "mean-alterer": return createMeanAlterer(config);
+			case "correlation-mean-alterer": return (Alterer<G, FitnessValue>) createCorrelationMeanAlterer(config);
+			case "partial-matched-alterer": return createPartiallyMatchedAlterer(config);
+			case "correlation-partial-matched-alterer": return createCorrelationPartiallyMatchedAlterer(config);
+
+			case "gaussian-mutator": return createGaussianMutator(config);
+			case "correlation-gaussian-mutator": return createGaussianCorrelationMutator(config);
+			case "swap-mutator": return createSwapMutator(config);
+			case "correlation-swap-mutator": return createCorrelationSwapMutator(config);
+			case "bit-flip-mutator": return createBitFlipMutator(config);
+			case "correlation-bit-flip-mutator": return createCorrelationBitFlipMutator(config);
 
 //			case "IntermediateCrossover": return createIntermediateCrossover(config);
-			case "line_crossover": return createLineCrossover(config);
-			case "correlation_line_crossover": return createCorrelationLineCrossover(config);
-			case "multi_point_crossover": return createMultiPointCrossover(config);
-			case "correlation_multi_point_crossover": return createCorrelationMultiPointCrossover(config);
-			case "single_point_crossover": return createSinglePointCrossover(config);
-			case "correlation_single_point_crossover": return createCorrelationSinglePointCrossover(config);
-			case "uniform_crossover": return createUniformCrossover(config);
-			case "correlation_uniform_crossover": return createCorrelationUniformCrossover(config);
+			case "line-crossover": return createLineCrossover(config);
+			case "correlation-line-crossover": return createCorrelationLineCrossover(config);
+			case "multi-point-crossover": return createMultiPointCrossover(config);
+			case "correlation-multi-point-crossover": return createCorrelationMultiPointCrossover(config);
+			case "single-point-crossover": return createSinglePointCrossover(config);
+			case "correlation-single-point-crossover": return createCorrelationSinglePointCrossover(config);
+			case "uniform-crossover": return createUniformCrossover(config);
+			case "correlation-uniform-crossover": return createCorrelationUniformCrossover(config);
 		}
 		throw new IllegalStateException("Selector '" + name + "' is unknown.");
 	}
 
 	private <G extends Gene<?, G>> Alterer<G, FitnessValue> createUniformCrossover(final Instance config) {
-		final Double crossoverProbability = LanguageHelper.lookup(config, "crossover_probability");
-		final Double swapProbability = LanguageHelper.lookup(config,"swap_probability");
+		final Double crossoverProbability = LanguageHelper.lookup(config, "crossover-probability");
+		final Double swapProbability = LanguageHelper.lookup(config,"swap-probability");
 
 		return new UniformCrossover<>(crossoverProbability, swapProbability);
 	}
 
 	private <G extends Gene<?, G>> Alterer<G, FitnessValue> createCorrelationUniformCrossover(final Instance config) {
-		final Double crossoverProbability = LanguageHelper.lookup(config, "crossover_probability");
-		final Double swapProbability = LanguageHelper.lookup(config,"swap_probability");
+		final Double crossoverProbability = LanguageHelper.lookup(config, "crossover-probability");
+		final Double swapProbability = LanguageHelper.lookup(config,"swap-probability");
 		
 		return new UniformCorrelationCrossover(crossoverProbability, swapProbability, correlations);
 	}
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/producer/SelectorFactory.java b/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/producer/SelectorFactory.java
index 552e76942b2f25709700e5f5f1356b1635aecfcc..3241b26f36bd1d04bcffddb55631a67d830ce080 100644
--- a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/producer/SelectorFactory.java
+++ b/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/producer/SelectorFactory.java
@@ -30,14 +30,14 @@ public class SelectorFactory {
 
 	private <G extends Gene<?, G>, C extends Comparable<? super C>> Selector<G, C> create(final String name, final Instance config) {
 		switch(name) {
-			case "elite_selector": return createEliteSelector(config);
-			case "monte_carlo_selector": return createMonteCarloSelector(config);
-			case "exponential_rank_selector": return createExponentialRankSelector(config);
-			case "linear_rank_selector": return createLinearRankSelector(config);
-			case "boltzmann_selector": return createBoltzmannSelector(config);
-			case "stochastic_universal_selector": return createStochasticUniversalSelector(config);
-			case "tournament_selector": return createTournamentSelector(config);
-			case "truncation_selector": return createTruncationSelector(config);
+			case "elite-selector": return createEliteSelector(config);
+			case "monte-carlo-selector": return createMonteCarloSelector(config);
+			case "exponential-rank-selector": return createExponentialRankSelector(config);
+			case "linear-rank-selector": return createLinearRankSelector(config);
+			case "boltzmann-selector": return createBoltzmannSelector(config);
+			case "stochastic-universal-selector": return createStochasticUniversalSelector(config);
+			case "tournament-selector": return createTournamentSelector(config);
+			case "truncation-selector": return createTruncationSelector(config);
 			
 		}
 		throw new IllegalStateException("Selector '" + name + "' is unknown.");
diff --git a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingInitialPopulation.java b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingInitialPopulation.java
index 5096455a3a239f6531aedf7cee9b4dcadd583086..3c0454d26a4d51ea4f04063beccd45ca7ac9c16f 100644
--- a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingInitialPopulation.java
+++ b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingInitialPopulation.java
@@ -28,7 +28,7 @@ import java.io.File;
 public class TrainingInitialPopulation<G extends Gene<?, G>, C extends Comparable<C>> implements InitialPopulation<G, C> {
 
     @Inject
-    @ConfigurationValue(entry = BlackboardEntry.OPTIMISATION_CONFIGURATION, access = "algorithm.size_of_population")
+    @ConfigurationValue(entry = BlackboardEntry.OPTIMISATION_CONFIGURATION, access = "algorithm.size-of-population")
     private int sizeOfPopulation;
 
     @Inject