diff --git a/baystation12.dme b/baystation12.dme
index 42d2261fb35..f66810729f7 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1178,17 +1178,16 @@
 #include "code\modules\research\xenoarchaeology\finds\finds_fossils.dm"
 #include "code\modules\research\xenoarchaeology\finds\finds_misc.dm"
 #include "code\modules\research\xenoarchaeology\finds\finds_talkingitem.dm"
-#include "code\modules\research\xenoarchaeology\machinery\accelerator.dm"
-#include "code\modules\research\xenoarchaeology\machinery\analysis.dm"
-#include "code\modules\research\xenoarchaeology\machinery\fourier_transform.dm"
-#include "code\modules\research\xenoarchaeology\machinery\gas_chromatography.dm"
-#include "code\modules\research\xenoarchaeology\machinery\harvester.dm"
-#include "code\modules\research\xenoarchaeology\machinery\hyperspectral.dm"
-#include "code\modules\research\xenoarchaeology\machinery\ion_mobility.dm"
-#include "code\modules\research\xenoarchaeology\machinery\isotope_ratio.dm"
-#include "code\modules\research\xenoarchaeology\machinery\machinery_base.dm"
-#include "code\modules\research\xenoarchaeology\machinery\scanner.dm"
-#include "code\modules\research\xenoarchaeology\machinery\unknown_db.dm"
+#include "code\modules\research\xenoarchaeology\machinery\analysis_accelerator.dm"
+#include "code\modules\research\xenoarchaeology\machinery\analysis_base.dm"
+#include "code\modules\research\xenoarchaeology\machinery\analysis_fourier_transform.dm"
+#include "code\modules\research\xenoarchaeology\machinery\analysis_gas_chromatography.dm"
+#include "code\modules\research\xenoarchaeology\machinery\analysis_hyperspectral.dm"
+#include "code\modules\research\xenoarchaeology\machinery\analysis_ion_mobility.dm"
+#include "code\modules\research\xenoarchaeology\machinery\analysis_isotope_ratio.dm"
+#include "code\modules\research\xenoarchaeology\machinery\artifact_analyser.dm"
+#include "code\modules\research\xenoarchaeology\machinery\artifact_harvester.dm"
+#include "code\modules\research\xenoarchaeology\machinery\artifact_scanner.dm"
 #include "code\modules\research\xenoarchaeology\tools\ano_device_battery.dm"
 #include "code\modules\research\xenoarchaeology\tools\anomaly_suit.dm"
 #include "code\modules\research\xenoarchaeology\tools\bunsen_burner.dm"
diff --git a/code/modules/research/xenoarchaeology/machinery/accelerator.dm b/code/modules/research/xenoarchaeology/machinery/analysis_accelerator.dm
similarity index 100%
rename from code/modules/research/xenoarchaeology/machinery/accelerator.dm
rename to code/modules/research/xenoarchaeology/machinery/analysis_accelerator.dm
diff --git a/code/modules/research/xenoarchaeology/machinery/machinery_base.dm b/code/modules/research/xenoarchaeology/machinery/analysis_base.dm
similarity index 100%
rename from code/modules/research/xenoarchaeology/machinery/machinery_base.dm
rename to code/modules/research/xenoarchaeology/machinery/analysis_base.dm
diff --git a/code/modules/research/xenoarchaeology/machinery/fourier_transform.dm b/code/modules/research/xenoarchaeology/machinery/analysis_fourier_transform.dm
similarity index 100%
rename from code/modules/research/xenoarchaeology/machinery/fourier_transform.dm
rename to code/modules/research/xenoarchaeology/machinery/analysis_fourier_transform.dm
diff --git a/code/modules/research/xenoarchaeology/machinery/gas_chromatography.dm b/code/modules/research/xenoarchaeology/machinery/analysis_gas_chromatography.dm
similarity index 100%
rename from code/modules/research/xenoarchaeology/machinery/gas_chromatography.dm
rename to code/modules/research/xenoarchaeology/machinery/analysis_gas_chromatography.dm
diff --git a/code/modules/research/xenoarchaeology/machinery/hyperspectral.dm b/code/modules/research/xenoarchaeology/machinery/analysis_hyperspectral.dm
similarity index 100%
rename from code/modules/research/xenoarchaeology/machinery/hyperspectral.dm
rename to code/modules/research/xenoarchaeology/machinery/analysis_hyperspectral.dm
diff --git a/code/modules/research/xenoarchaeology/machinery/ion_mobility.dm b/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm
similarity index 100%
rename from code/modules/research/xenoarchaeology/machinery/ion_mobility.dm
rename to code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm
diff --git a/code/modules/research/xenoarchaeology/machinery/isotope_ratio.dm b/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm
similarity index 100%
rename from code/modules/research/xenoarchaeology/machinery/isotope_ratio.dm
rename to code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm
diff --git a/code/modules/research/xenoarchaeology/machinery/analysis.dm b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm
similarity index 100%
rename from code/modules/research/xenoarchaeology/machinery/analysis.dm
rename to code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm
diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_old.dm b/code/modules/research/xenoarchaeology/machinery/artifact_analyser_old.dm
similarity index 100%
rename from code/modules/research/xenoarchaeology/machinery/analysis_old.dm
rename to code/modules/research/xenoarchaeology/machinery/artifact_analyser_old.dm
diff --git a/code/modules/research/xenoarchaeology/machinery/unknown_db.dm b/code/modules/research/xenoarchaeology/machinery/artifact_db_old.dm
similarity index 100%
rename from code/modules/research/xenoarchaeology/machinery/unknown_db.dm
rename to code/modules/research/xenoarchaeology/machinery/artifact_db_old.dm
diff --git a/code/modules/research/xenoarchaeology/machinery/harvester.dm b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
similarity index 100%
rename from code/modules/research/xenoarchaeology/machinery/harvester.dm
rename to code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
diff --git a/code/modules/research/xenoarchaeology/machinery/scanner.dm b/code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm
similarity index 100%
rename from code/modules/research/xenoarchaeology/machinery/scanner.dm
rename to code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm