diff --git a/src/build/build_options.h b/src/build/build_options.h
index ca951336a..4c7c5d5b1 100644
--- a/src/build/build_options.h
+++ b/src/build/build_options.h
@@ -111,8 +111,8 @@ typedef enum
 {
 	OPTIMIZATION_NOT_SET = -1,
 	OPTIMIZATION_NONE = 0,          // -O0
-	OPTIMIZATION_LESS = 1,          // -O1
-	OPTIMIZATION_DEFAULT = 2,       // -O2
+	OPTIMIZATION_DEFAULT = 1,       // -O1
+	OPTIMIZATION_MORE = 2,          // -O2
 	OPTIMIZATION_AGGRESSIVE = 3,    // -O3
 } OptimizationLevel;
 
diff --git a/src/build/builder.c b/src/build/builder.c
index 6055ee83b..4c64b2f71 100644
--- a/src/build/builder.c
+++ b/src/build/builder.c
@@ -106,7 +106,7 @@ void update_build_target_with_opt_level(BuildTarget *target, OptimizationSetting
 			target->single_module = true;
 			FALLTHROUGH;
 		case OPT_SETTING_O1:
-			target->optimization_level = OPTIMIZATION_LESS;
+			target->optimization_level = OPTIMIZATION_DEFAULT;
 			target->size_optimization_level = SIZE_OPTIMIZATION_NONE;
 			target->feature.safe_mode = false;
 			break;
@@ -114,7 +114,7 @@ void update_build_target_with_opt_level(BuildTarget *target, OptimizationSetting
 			target->single_module = true;
 			FALLTHROUGH;
 		case OPT_SETTING_O2:
-			target->optimization_level = OPTIMIZATION_DEFAULT;
+			target->optimization_level = OPTIMIZATION_MORE;
 			target->size_optimization_level = SIZE_OPTIMIZATION_NONE;
 			target->feature.safe_mode = false;
 			break;
@@ -130,7 +130,7 @@ void update_build_target_with_opt_level(BuildTarget *target, OptimizationSetting
 			target->single_module = true;
 			FALLTHROUGH;
 		case OPT_SETTING_OSMALL:
-			target->optimization_level = OPTIMIZATION_DEFAULT;
+			target->optimization_level = OPTIMIZATION_MORE;
 			target->size_optimization_level = SIZE_OPTIMIZATION_SMALL;
 			target->feature.safe_mode = false;
 			break;
@@ -138,7 +138,7 @@ void update_build_target_with_opt_level(BuildTarget *target, OptimizationSetting
 			target->single_module = true;
 			FALLTHROUGH;
 		case OPT_SETTING_OTINY:
-			target->optimization_level = OPTIMIZATION_DEFAULT;
+			target->optimization_level = OPTIMIZATION_MORE;
 			target->size_optimization_level = SIZE_OPTIMIZATION_TINY;
 			target->feature.safe_mode = false;
 			break;
diff --git a/src/compiler/llvm_codegen.c b/src/compiler/llvm_codegen.c
index 9aa108e4c..eb03d31a2 100644
--- a/src/compiler/llvm_codegen.c
+++ b/src/compiler/llvm_codegen.c
@@ -839,11 +839,11 @@ static inline void llvm_optimize(GenContext *c)
 			break;
 		case OPTIMIZATION_NOT_SET:
 		case OPTIMIZATION_DEFAULT:
-			if (!passes) passes = "default<O2>";
-			break;
-		case OPTIMIZATION_LESS:
 			if (!passes) passes = "default<O1>";
 			break;
+		case OPTIMIZATION_MORE:
+			if (!passes) passes = "default<O2>";
+			break;
 		case OPTIMIZATION_AGGRESSIVE:
 			if (!passes) passes = "default<O3>";
 			break;
diff --git a/src/compiler/target.c b/src/compiler/target.c
index 52ae10b53..f999c4618 100644
--- a/src/compiler/target.c
+++ b/src/compiler/target.c
@@ -1739,11 +1739,9 @@ void target_setup(BuildTarget *target)
 			level = LLVMCodeGenLevelAggressive;
 			break;
 		case OPTIMIZATION_DEFAULT:
+		case OPTIMIZATION_MORE:
 			level = LLVMCodeGenLevelDefault;
 			break;
-		case OPTIMIZATION_LESS:
-			level = LLVMCodeGenLevelLess;
-			break;
 		case OPTIMIZATION_NONE:
 			level = LLVMCodeGenLevelNone;
 			break;
diff --git a/src/version.h b/src/version.h
index 15837ef37..f4e18107c 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define COMPILER_VERSION "0.4.609"
\ No newline at end of file
+#define COMPILER_VERSION "0.4.610"
\ No newline at end of file