diff --git a/build_opts/ALPHA_FS b/build_opts/ALPHA
similarity index 83%
rename from build_opts/ALPHA_FS
rename to build_opts/ALPHA
index ffe532690..384394091 100644
--- a/build_opts/ALPHA_FS
+++ b/build_opts/ALPHA
@@ -1,4 +1,4 @@
 TARGET_ISA = 'alpha'
-FULL_SYSTEM = 1
+SS_COMPATIBLE_FP = 1
 CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
 PROTOCOL = 'MI_example'
diff --git a/build_opts/ALPHA_SE_MESI_CMP_directory b/build_opts/ALPHA_MESI_CMP_directory
similarity index 87%
rename from build_opts/ALPHA_SE_MESI_CMP_directory
rename to build_opts/ALPHA_MESI_CMP_directory
index c55731b30..32eeb0d11 100644
--- a/build_opts/ALPHA_SE_MESI_CMP_directory
+++ b/build_opts/ALPHA_MESI_CMP_directory
@@ -1,4 +1,3 @@
-FULL_SYSTEM = 0
 SS_COMPATIBLE_FP = 1
 CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
 PROTOCOL = 'MESI_CMP_directory'
diff --git a/build_opts/ALPHA_SE_MOESI_CMP_directory b/build_opts/ALPHA_MOESI_CMP_directory
similarity index 88%
rename from build_opts/ALPHA_SE_MOESI_CMP_directory
rename to build_opts/ALPHA_MOESI_CMP_directory
index 5edc7688b..be42e636c 100644
--- a/build_opts/ALPHA_SE_MOESI_CMP_directory
+++ b/build_opts/ALPHA_MOESI_CMP_directory
@@ -1,4 +1,3 @@
-FULL_SYSTEM = 0
 SS_COMPATIBLE_FP = 1
 CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
 PROTOCOL = 'MOESI_CMP_directory'
diff --git a/build_opts/ALPHA_SE_MOESI_CMP_token b/build_opts/ALPHA_MOESI_CMP_token
similarity index 87%
rename from build_opts/ALPHA_SE_MOESI_CMP_token
rename to build_opts/ALPHA_MOESI_CMP_token
index f69c2c48c..0c94391fa 100644
--- a/build_opts/ALPHA_SE_MOESI_CMP_token
+++ b/build_opts/ALPHA_MOESI_CMP_token
@@ -1,4 +1,3 @@
-FULL_SYSTEM = 0
 SS_COMPATIBLE_FP = 1
 CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
 PROTOCOL = 'MOESI_CMP_token'
diff --git a/build_opts/ALPHA_SE_MOESI_hammer b/build_opts/ALPHA_MOESI_hammer
similarity index 87%
rename from build_opts/ALPHA_SE_MOESI_hammer
rename to build_opts/ALPHA_MOESI_hammer
index f21ca5e5d..99e8f685b 100644
--- a/build_opts/ALPHA_SE_MOESI_hammer
+++ b/build_opts/ALPHA_MOESI_hammer
@@ -1,4 +1,3 @@
-FULL_SYSTEM = 0
 SS_COMPATIBLE_FP = 1
 CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
 PROTOCOL = 'MOESI_hammer'
diff --git a/build_opts/ALPHA_SE_Network_test b/build_opts/ALPHA_Network_test
similarity index 87%
rename from build_opts/ALPHA_SE_Network_test
rename to build_opts/ALPHA_Network_test
index 77426d349..90bec0c2f 100644
--- a/build_opts/ALPHA_SE_Network_test
+++ b/build_opts/ALPHA_Network_test
@@ -1,4 +1,3 @@
-FULL_SYSTEM = 0
 SS_COMPATIBLE_FP = 1
 CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
 PROTOCOL = 'Network_test'
diff --git a/build_opts/ALPHA_SE b/build_opts/ALPHA_SE
deleted file mode 100644
index b21fec4cb..000000000
--- a/build_opts/ALPHA_SE
+++ /dev/null
@@ -1,4 +0,0 @@
-FULL_SYSTEM = 0
-SS_COMPATIBLE_FP = 1
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
-PROTOCOL = 'MI_example'
diff --git a/build_opts/ARM_FS b/build_opts/ARM
similarity index 85%
rename from build_opts/ARM_FS
rename to build_opts/ARM
index f6b2d9e21..9c27c0d27 100644
--- a/build_opts/ARM_FS
+++ b/build_opts/ARM
@@ -1,4 +1,3 @@
 TARGET_ISA = 'arm'
 CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU'
-FULL_SYSTEM = 1
 PROTOCOL = 'MI_example'
diff --git a/build_opts/ARM_SE b/build_opts/ARM_SE
deleted file mode 100644
index 1d89b87a3..000000000
--- a/build_opts/ARM_SE
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ISA = 'arm'
-FULL_SYSTEM = 0
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU'
-PROTOCOL = 'MI_example'
diff --git a/build_opts/MIPS_SE b/build_opts/MIPS
similarity index 87%
rename from build_opts/MIPS_SE
rename to build_opts/MIPS
index 085557898..82a9d6243 100644
--- a/build_opts/MIPS_SE
+++ b/build_opts/MIPS
@@ -1,4 +1,3 @@
 TARGET_ISA = 'mips'
-FULL_SYSTEM = 0
 CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
 PROTOCOL = 'MI_example'
diff --git a/build_opts/POWER_SE b/build_opts/POWER
similarity index 85%
rename from build_opts/POWER_SE
rename to build_opts/POWER
index 13e175ebc..672046cee 100644
--- a/build_opts/POWER_SE
+++ b/build_opts/POWER
@@ -1,4 +1,3 @@
 TARGET_ISA = 'power'
-FULL_SYSTEM = 0
 CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU'
 PROTOCOL = 'MI_example'
diff --git a/build_opts/SPARC_SE b/build_opts/SPARC
similarity index 87%
rename from build_opts/SPARC_SE
rename to build_opts/SPARC
index a76d7a826..e992b8cd9 100644
--- a/build_opts/SPARC_SE
+++ b/build_opts/SPARC
@@ -1,4 +1,3 @@
 TARGET_ISA = 'sparc'
 CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
-FULL_SYSTEM = 0
 PROTOCOL = 'MI_example'
diff --git a/build_opts/SPARC_FS b/build_opts/SPARC_FS
deleted file mode 100644
index f1dd81481..000000000
--- a/build_opts/SPARC_FS
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ISA = 'sparc'
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU'
-FULL_SYSTEM = 1
-PROTOCOL = 'MI_example'
diff --git a/build_opts/X86_FS b/build_opts/X86
similarity index 85%
rename from build_opts/X86_FS
rename to build_opts/X86
index ddec6186d..64d163c5a 100644
--- a/build_opts/X86_FS
+++ b/build_opts/X86
@@ -1,4 +1,3 @@
 TARGET_ISA = 'x86'
 CPU_MODELS = 'AtomicSimpleCPU,O3CPU,TimingSimpleCPU'
-FULL_SYSTEM = 1
 PROTOCOL = 'MI_example'
diff --git a/build_opts/X86_SE b/build_opts/X86_SE
deleted file mode 100644
index 14f350712..000000000
--- a/build_opts/X86_SE
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ISA = 'x86'
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU'
-FULL_SYSTEM = 0
-PROTOCOL = 'MI_example'