diff --git a/repos/base/mk/generic.mk b/repos/base/mk/generic.mk
index c11b9dbf58..7eb302e195 100644
--- a/repos/base/mk/generic.mk
+++ b/repos/base/mk/generic.mk
@@ -84,13 +84,13 @@ CUSTOM_ADA_INCLUDE ?= -I- $(INCLUDES)
 
 %.ali %.o: %.adb
 	$(MSG_COMP)$@
-	$(VERBOSE)$(CC) $(CUSTOM_ADA_FLAGS) $(CUSTOM_ADA_OPT) $(CUSTOM_ADA_INCLUDE) -c $<
-	$(VERBOSE)$(ALI2DEP) $(ALL_INC_DIR) $*.ali
+	$(VERBOSE)$(CUSTOM_ADA_CC) $(CUSTOM_ADA_FLAGS) $(CUSTOM_ADA_OPT) $(CUSTOM_ADA_INCLUDE) -c $<
+	$(VERBOSE)$(ALI2DEP) $(dir $<) $(ALL_INC_DIR) $*.ali
 
 %.ali %.o: %.ads
 	$(MSG_COMP)$@
-	$(VERBOSE)$(CC) $(CUSTOM_ADA_FLAGS) $(CUSTOM_ADA_OPT) $(CUSTOM_ADA_INCLUDE) -c $<
-	$(VERBOSE)$(ALI2DEP) $(ALL_INC_DIR) $*.ali
+	$(VERBOSE)$(CUSTOM_ADA_CC) $(CUSTOM_ADA_FLAGS) $(CUSTOM_ADA_OPT) $(CUSTOM_ADA_INCLUDE) -c $<
+	$(VERBOSE)$(ALI2DEP) $(dir $<) $(ALL_INC_DIR) $*.ali
 
 #
 # Compiling Rust sources
diff --git a/repos/base/mk/global.mk b/repos/base/mk/global.mk
index 1f95d8aa1d..be3767fe1d 100644
--- a/repos/base/mk/global.mk
+++ b/repos/base/mk/global.mk
@@ -25,7 +25,7 @@ CUSTOM_STRIP    ?= $(CROSS_DEV_PREFIX)strip
 CUSTOM_GNATBIND ?= $(CROSS_DEV_PREFIX)gnatbind
 CUSTOM_HOST_CC  ?= gcc
 CUSTOM_ADA_CC   ?= $(CUSTOM_CC)
-CUSTOM_ALI2DEP  ?= echo "        WARNING: ali2dep not used, get it from https://github.com/Componolit/ali2dep and make CUSTUM_ALI2DEP point to the binary." \#
+CUSTOM_ALI2DEP  ?= echo "        WARNING: ali2dep not used, get it from https://github.com/Componolit/ali2dep and make CUSTOM_ALI2DEP point to the binary." \#
 
 #
 # GNU utilities
diff --git a/repos/base/mk/prg.mk b/repos/base/mk/prg.mk
index 2c0c2ac493..bbb5f7f438 100644
--- a/repos/base/mk/prg.mk
+++ b/repos/base/mk/prg.mk
@@ -111,7 +111,9 @@ CUSTOM_BINDER_FLAGS ?= -n -we
 OBJECTS += b~$(TARGET).o
 
 ALIS := $(addsuffix .ali, $(basename $(SRC_ADS) $(SRC_ADB)))
-BINDER_SEARCH_DIRS = $(addprefix -I$(BUILD_BASE_DIR)/var/libcache/, $(LIBS))
+ALI_DIRS := $(foreach LIB,$(LIBS),$(call select_from_repositories,lib/ali/$(LIB)))
+BINDER_SEARCH_DIRS = $(addprefix -I$(BUILD_BASE_DIR)/var/libcache/, $(LIBS)) $(addprefix -aO, $(ALI_DIRS))
+
 BINDER_SRC := b~$(TARGET).ads b~$(TARGET).adb
 
 $(BINDER_SRC): $(ALIS)
diff --git a/repos/gems/run/depot_autopilot.run b/repos/gems/run/depot_autopilot.run
index 22bed701d1..b8d30c1564 100644
--- a/repos/gems/run/depot_autopilot.run
+++ b/repos/gems/run/depot_autopilot.run
@@ -646,9 +646,9 @@ if {[expr ![have_spec x86] && \
 # ! find . -type d -wholename *recipes/pkg/test-* -printf '%f\n' | sort
 #
 set default_test_pkgs {
-	test-ada
-	test-ada_exception
-	test-ada_secondary_stack
+	test-spark
+	test-spark_exception
+	test-spark_secondary_stack
 	test-block
 	test-block_cache
 	test-clipboard
diff --git a/repos/gems/src/app/depot_autopilot/README b/repos/gems/src/app/depot_autopilot/README
index f16cdf1f92..882c16483a 100644
--- a/repos/gems/src/app/depot_autopilot/README
+++ b/repos/gems/src/app/depot_autopilot/README
@@ -266,7 +266,7 @@ Integration
   example content of this report:
 
   ! <query arch="x86_64">
-  !   <blueprint pkg="genodelabs/pkg/test-ada/2018-11-02"/>
+  !   <blueprint pkg="genodelabs/pkg/test-spark/2018-11-02"/>
   ! </query>
 
   The format is compliant to that of the "query" ROM required by the Depot
@@ -277,8 +277,8 @@ Integration
   like this:
 
   ! <blueprint>
-  !   <pkg name="test-ada" path="genodelabs/pkg/test-ada/2018-11-02">
-  !     <rom label="ada.lib.so" path="genodelabs/bin/x86_64/ada/2018-11-01/ada.lib.so"/>
+  !   <pkg name="test-spark" path="genodelabs/pkg/test-spark/2018-11-02">
+  !     <rom label="spark.lib.so" path="genodelabs/bin/x86_64/spark/2018-11-01/spark.lib.so"/>
   !     <missing_rom label="ld.lib.so"/>
   !     ... # further <rom> and <missing_rom> tags
   !
@@ -298,7 +298,7 @@ Integration
   ! <config>
   !   ... # content of <static> tag in Autopilot configuration
   !
-  !   <start name="test-ada" caps="1000">
+  !   <start name="test-spark" caps="1000">
   !     <binary name="init"/>
   !     <resource name="RAM" quantum="32M"/>
   !
@@ -308,8 +308,8 @@ Integration
   !       ... # content of <common_routes> tag in Autopilot configuration
   !
   !       # routes for each <content><rom> tags in the tests runtime file
-  !       <service name="ROM" label_last="test-ada">
-  !         <parent label="genodelabs/bin/x86_64/test-ada/2018-11-02/test-ada"/>
+  !       <service name="ROM" label_last="test-spark">
+  !         <parent label="genodelabs/bin/x86_64/test-spark/2018-11-02/test-spark"/>
   !       </service>
   !       ...
   !
diff --git a/repos/libports/lib/import/import-ada.mk b/repos/libports/lib/import/import-ada.mk
deleted file mode 100644
index 52fe6e4f51..0000000000
--- a/repos/libports/lib/import/import-ada.mk
+++ /dev/null
@@ -1 +0,0 @@
-ADA_RTS = $(BUILD_BASE_DIR)/var/libcache/ada
diff --git a/repos/libports/lib/import/import-spark.mk b/repos/libports/lib/import/import-spark.mk
new file mode 100644
index 0000000000..ac2df4c980
--- /dev/null
+++ b/repos/libports/lib/import/import-spark.mk
@@ -0,0 +1,13 @@
+ADA_RTS = $(BUILD_BASE_DIR)/var/libcache/spark
+
+ADA_RTS_SOURCE = $(call select_from_ports,ada-runtime)/ada-runtime/contrib/gcc-6.3.0
+ADA_RUNTIME_DIR = $(call select_from_ports,ada-runtime)/ada-runtime/src/minimal
+ADA_RUNTIME_LIB_DIR = $(call select_from_ports,ada-runtime)/ada-runtime/src/lib
+ADA_RUNTIME_PLATFORM_DIR = $(call select_from_ports,ada-runtime)/ada-runtime/platform
+
+INC_DIR += $(ADA_RUNTIME_DIR)
+INC_DIR += $(ADA_RUNTIME_LIB_DIR)
+INC_DIR += $(ADA_RTS_SOURCE)
+
+# Disable inline concatenation as this requires additinal runtime support
+CC_ADA_OPT += -gnatd.c
diff --git a/repos/libports/lib/import/import-test-ada.mk b/repos/libports/lib/import/import-test-ada.mk
deleted file mode 100644
index 0123bfe393..0000000000
--- a/repos/libports/lib/import/import-test-ada.mk
+++ /dev/null
@@ -1 +0,0 @@
-INC_DIR += $(REP_DIR)/src/test/ada/lib
diff --git a/repos/libports/lib/import/import-test-spark.mk b/repos/libports/lib/import/import-test-spark.mk
new file mode 100644
index 0000000000..cc24748f63
--- /dev/null
+++ b/repos/libports/lib/import/import-test-spark.mk
@@ -0,0 +1 @@
+INC_DIR += $(REP_DIR)/src/test/spark/lib
diff --git a/repos/libports/lib/mk/ada.inc b/repos/libports/lib/mk/ada.inc
deleted file mode 100644
index 68795bf351..0000000000
--- a/repos/libports/lib/mk/ada.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-include $(REP_DIR)/lib/import/import-ada.mk
-
-ADA_RTS_SOURCE = $(call select_from_ports,gcc)/src/noux-pkg/gcc/gcc/ada
-
-all: ada_source_path
-
-ada_source_path: ada_object_path
-	$(VERBOSE)echo $(ADA_RTS_SOURCE) > $(ADA_RTS)/ada_source_path
-
-ada_object_path:
-	$(VERBOSE)mkdir -p $(ADA_RTS)
-	$(VERBOSE)echo $(ADA_RTS) > $(ADA_RTS)/ada_object_path
diff --git a/repos/libports/lib/mk/ada.mk b/repos/libports/lib/mk/ada.mk
deleted file mode 100644
index ce81d56be2..0000000000
--- a/repos/libports/lib/mk/ada.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-
-include $(REP_DIR)/lib/mk/ada.inc
-
-ADALIB     = $(ADA_RTS)/adalib
-ADAINCLUDE = $(ADA_RTS)/adainclude
-
-ADA_RTS_SOURCE = $(call select_from_ports,ada-runtime)/ada-runtime/contrib/gcc-6.3.0
-ADA_RUNTIME_DIR = $(call select_from_ports,ada-runtime)/ada-runtime/src
-ADA_RUNTIME_LIB_DIR = $(call select_from_ports,ada-runtime)/ada-runtime/src/lib
-ADA_RUNTIME_PLATFORM_DIR = $(call select_from_ports,ada-runtime)/ada-runtime/platform
-
-SRC_ADS += system.ads \
-	   s-soflin.ads \
-	   s-imgint.ads \
-	   s-stoele.ads \
-	   s-secsta.ads \
-	   interfac.ads \
-	   a-except.ads \
-	   gnat.ads
-
-SRC_ADB += g-io.adb
-
-CUSTOM_ADA_FLAGS   = -c -gnatg -gnatp -gnatpg -gnatn2
-CUSTOM_ADA_OPT     = $(CC_ADA_OPT)
-CUSTOM_ADA_INCLUDE = -I- -I$(ADA_RUNTIME_DIR) -I$(ADA_RTS_SOURCE) -I$(ADA_RUNTIME_LIB_DIR)
-
-INC_DIR += $(ADA_RUNTIME_LIB_DIR)
-
-# C runtime glue code
-SRC_CC += genode.cc
-
-# Ada packages that implement runtime functionality
-SRC_ADB += ss_utils.adb string_utils.adb platform.adb
-
-vpath %.cc  $(ADA_RUNTIME_PLATFORM_DIR)
-
-vpath system.ads $(ADA_RTS_SOURCE)
-vpath s-soflin.ads $(ADA_RUNTIME_DIR)
-vpath s-stoele.ads $(ADA_RTS_SOURCE)
-vpath s-secsta.ads $(ADA_RUNTIME_DIR)
-vpath s-imgint.ads $(ADA_RTS_SOURCE)
-vpath a-except.ads $(ADA_RUNTIME_DIR)
-vpath interfac.ads $(ADA_RTS_SOURCE)
-vpath gnat.ads     $(ADA_RTS_SOURCE)
-vpath g-io.ads     $(ADA_RTS_SOURCE)
-
-vpath s-stoele.adb $(ADA_RTS_SOURCE)
-vpath s-secsta.adb $(ADA_RUNTIME_DIR)
-vpath s-soflin.adb $(ADA_RUNTIME_DIR)
-vpath s-imgint.adb $(ADA_RTS_SOURCE)
-vpath a-except.adb $(ADA_RUNTIME_DIR)
-vpath g-io.adb     $(ADA_RTS_SOURCE)
-
-vpath platform.% $(ADA_RUNTIME_LIB_DIR)
-vpath string_utils.% $(ADA_RUNTIME_LIB_DIR)
-vpath ss_utils.% $(ADA_RUNTIME_LIB_DIR)
-
-SHARED_LIB = yes
diff --git a/repos/libports/lib/mk/spark.inc b/repos/libports/lib/mk/spark.inc
new file mode 100644
index 0000000000..6366a34540
--- /dev/null
+++ b/repos/libports/lib/mk/spark.inc
@@ -0,0 +1,11 @@
+include $(REP_DIR)/lib/import/import-spark.mk
+
+all: ada_source_path
+
+ada_source_path: ada_object_path
+	$(VERBOSE)echo $(ADA_RTS_SOURCE)   > $(ADA_RTS)/ada_source_path
+	$(VERBOSE)echo $(ADA_RUNTIME_DIR) >> $(ADA_RTS)/ada_source_path
+
+ada_object_path:
+	$(VERBOSE)mkdir -p $(ADA_RTS)
+	$(VERBOSE)echo $(ADA_RTS) > $(ADA_RTS)/ada_object_path
diff --git a/repos/libports/lib/mk/spark.mk b/repos/libports/lib/mk/spark.mk
new file mode 100644
index 0000000000..b87c92218b
--- /dev/null
+++ b/repos/libports/lib/mk/spark.mk
@@ -0,0 +1,45 @@
+include $(REP_DIR)/lib/mk/spark.inc
+
+ADALIB     = $(ADA_RTS)/adalib
+ADAINCLUDE = $(ADA_RTS)/adainclude
+
+SRC_ADS += system.ads \
+	   s-soflin.ads \
+	   s-imgint.ads \
+	   s-stoele.ads \
+	   s-unstyp.ads \
+	   interfac.ads \
+	   a-except.ads \
+	   gnat.ads \
+	   ada.ads \
+	   ada_exceptions.ads
+
+SRC_ADB += g-io.adb s-stalib.adb s-secsta.adb s-parame.adb
+CUSTOM_ADA_FLAGS = --RTS=$(ADA_RTS) -c -gnatg -gnatp -gnatpg -gnatn2
+
+# C runtime glue code
+SRC_CC += genode.cc
+
+# Ada packages that implement runtime functionality
+SRC_ADB += ss_utils.adb string_utils.adb platform.adb
+
+vpath %.cc  $(ADA_RUNTIME_PLATFORM_DIR)
+
+vpath s-soflin.ads $(ADA_RUNTIME_DIR)
+vpath a-except.ads $(ADA_RUNTIME_DIR)
+
+vpath s-secsta.adb $(ADA_RUNTIME_DIR)
+vpath s-soflin.adb $(ADA_RUNTIME_DIR)
+vpath s-stalib.adb $(ADA_RUNTIME_DIR)
+vpath s-parame.adb $(ADA_RUNTIME_DIR)
+vpath a-except.adb $(ADA_RUNTIME_DIR)
+
+vpath %.ads $(ADA_RTS_SOURCE)
+vpath %.adb $(ADA_RTS_SOURCE)
+
+vpath platform.% $(ADA_RUNTIME_LIB_DIR)
+vpath string_utils.% $(ADA_RUNTIME_LIB_DIR)
+vpath ss_utils.% $(ADA_RUNTIME_LIB_DIR)
+vpath ada_exceptions.ads $(ADA_RUNTIME_LIB_DIR)
+
+SHARED_LIB = yes
diff --git a/repos/libports/lib/mk/test-ada.mk b/repos/libports/lib/mk/test-ada.mk
deleted file mode 100644
index 8b5285cd7c..0000000000
--- a/repos/libports/lib/mk/test-ada.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-LIBS    += base ada
-SRC_ADB += add_package.adb
-
-include $(REP_DIR)/lib/import/import-test-ada.mk
-
-vpath %.adb $(REP_DIR)/src/test/ada/lib
diff --git a/repos/libports/lib/mk/test-spark.mk b/repos/libports/lib/mk/test-spark.mk
new file mode 100644
index 0000000000..44fc060360
--- /dev/null
+++ b/repos/libports/lib/mk/test-spark.mk
@@ -0,0 +1,6 @@
+LIBS    += base spark
+SRC_ADB += add_package.adb
+
+include $(REP_DIR)/lib/import/import-test-spark.mk
+
+vpath %.adb $(REP_DIR)/src/test/spark/lib
diff --git a/repos/libports/lib/symbols/ada b/repos/libports/lib/symbols/spark
similarity index 100%
rename from repos/libports/lib/symbols/ada
rename to repos/libports/lib/symbols/spark
diff --git a/repos/libports/ports/ada-runtime.hash b/repos/libports/ports/ada-runtime.hash
index ec3df6f373..4978d9603e 100644
--- a/repos/libports/ports/ada-runtime.hash
+++ b/repos/libports/ports/ada-runtime.hash
@@ -1 +1 @@
-eea97604807f7cbb9b9c1aea9d4f0da6256d75b9
+6fcdbbc50a6e5d2bc031f9191bd57854a27c5e09
diff --git a/repos/libports/ports/ada-runtime.port b/repos/libports/ports/ada-runtime.port
index 870cebcc54..a96135b89b 100644
--- a/repos/libports/ports/ada-runtime.port
+++ b/repos/libports/ports/ada-runtime.port
@@ -1,7 +1,11 @@
-LICENSE   := AGPLv3
+LICENSE   := AGPLv3 + GCC runtime library exception
 VERSION   := 0
-DOWNLOADS := ada-runtime.git
+DOWNLOADS := ada-runtime.git ada-runtime-alis.git
 
 URL(ada-runtime) := https://github.com/Componolit/ada-runtime.git
-REV(ada-runtime) := 6ebc27d7954eff4d027b3834f10a0934523c569b
+REV(ada-runtime) := 6a84715677e7538240360ee41a52912e6250dc8e
 DIR(ada-runtime) := ada-runtime
+
+URL(ada-runtime-alis) := https://github.com/Componolit/ada-runtime-alis.git
+REV(ada-runtime-alis) := cf9d8b99c783c080f8be9b39761f80469622b5c6
+DIR(ada-runtime-alis) := ada-runtime-alis
diff --git a/repos/libports/recipes/api/ada/content.mk b/repos/libports/recipes/api/ada/content.mk
deleted file mode 100644
index ddd5a96c92..0000000000
--- a/repos/libports/recipes/api/ada/content.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-ADA_RT_DIR := $(call port_dir,$(GENODE_DIR)/repos/libports/ports/ada-runtime)
-
-MIRROR_FROM_ADA_RT_DIR := \
-	$(addprefix ada-runtime/contrib/gcc-6.3.0/,\
-		ada.ads \
-		system.ads \
-		s-stoele.ads \
-		a-unccon.ads \
-		gnat.ads \
-		g-io.ads \
-	)\
-	$(addprefix ada-runtime/src/,\
-		s-stalib.ads \
-		a-except.ads \
-		s-secsta.ads \
-		s-parame.ads \
-		s-soflin.ads \
-	)\
-	$(addprefix ada-runtime/src/lib/,\
-		ss_utils.ads \
-	)
-
-#	$(addprefix ada-runtime/src/,\
-		s-stache.ads \
-		s-conca2.ads \
-		s-arit64.ads \
-	)\
-	$(addprefix ada-runtime/contrib/gcc-6.3.0/,\
-		interfac.ads \
-		system.ads \
-	)
-
-content: $(MIRROR_FROM_ADA_RT_DIR)
-
-$(MIRROR_FROM_ADA_RT_DIR):
-	mkdir -p src/noux-pkg/gcc/gcc/ada/
-	cp -r $(ADA_RT_DIR)/$@ src/noux-pkg/gcc/gcc/ada/
-
-MIRROR_FROM_REP_DIR := \
-	lib/import/import-ada.mk \
-	include/ada \
-	lib/symbols/ada
-
-content: $(MIRROR_FROM_REP_DIR)
-
-$(MIRROR_FROM_REP_DIR):
-	$(mirror_from_rep_dir)
-
-content: lib/mk/ada.mk
-
-lib/mk/ada.mk:
-	mkdir -p $(dir $@)
-	cp -r $(REP_DIR)/lib/mk/ada.inc $@
diff --git a/repos/libports/recipes/api/ada/hash b/repos/libports/recipes/api/ada/hash
deleted file mode 100644
index e2e81fd5ea..0000000000
--- a/repos/libports/recipes/api/ada/hash
+++ /dev/null
@@ -1 +0,0 @@
-2019-01-03 f064c0ffc41ac5571bdaaf66dbad6b35c79db390
diff --git a/repos/libports/recipes/api/spark/content.mk b/repos/libports/recipes/api/spark/content.mk
new file mode 100644
index 0000000000..d95c4a6fe6
--- /dev/null
+++ b/repos/libports/recipes/api/spark/content.mk
@@ -0,0 +1,67 @@
+ADA_RT_DIR  := $(call port_dir,$(GENODE_DIR)/repos/libports/ports/ada-runtime)
+ADA_ALI_DIR := $(call port_dir,$(GENODE_DIR)/repos/libports/ports/ada-runtime)/ada-runtime-alis/alis
+
+MIRROR_FROM_ADA_RT_DIR := \
+	$(addprefix ada-runtime/contrib/gcc-6.3.0/,\
+		ada.ads \
+		system.ads \
+		s-stoele.ads \
+		a-unccon.ads \
+		gnat.ads \
+		g-io.ads \
+	)\
+	$(addprefix ada-runtime/src/minimal/,\
+		s-stalib.ads \
+		a-except.ads \
+		s-secsta.ads \
+		s-parame.ads \
+		s-soflin.ads \
+	)\
+	$(addprefix ada-runtime/src/lib/,\
+		ss_utils.ads \
+	)
+
+MIRROR_FROM_ADA_ALI_DIR := \
+	ada.ali \
+	ada_exceptions.ali \
+	a-except.ali \
+	g-io.ali \
+	gnat.ali \
+	interfac.ali \
+	platform.ali \
+	s-imgint.ali \
+	s-parame.ali \
+	s-secsta.ali \
+	s-soflin.ali \
+	s-stalib.ali \
+	s-stoele.ali \
+	ss_utils.ali \
+	string_utils.ali \
+	s-unstyp.ali \
+	system.ali \
+
+content: $(MIRROR_FROM_ADA_RT_DIR) $(MIRROR_FROM_ADA_ALI_DIR)
+
+$(MIRROR_FROM_ADA_RT_DIR):
+	mkdir -p include
+	cp $(ADA_RT_DIR)/$@ include/
+
+$(MIRROR_FROM_ADA_ALI_DIR):
+	mkdir -p lib/ali/spark
+	cp $(ADA_ALI_DIR)/$@ lib/ali/spark/
+
+MIRROR_FROM_REP_DIR := \
+	lib/import/import-spark.mk \
+	include/ada \
+	lib/symbols/spark \
+
+content: $(MIRROR_FROM_REP_DIR)
+
+$(MIRROR_FROM_REP_DIR):
+	$(mirror_from_rep_dir)
+
+content: lib/mk/spark.mk
+
+lib/mk/spark.mk:
+	mkdir -p $(dir $@)
+	cp -r $(REP_DIR)/lib/mk/spark.inc $@
diff --git a/repos/libports/recipes/api/spark/hash b/repos/libports/recipes/api/spark/hash
new file mode 100644
index 0000000000..8df1a817b0
--- /dev/null
+++ b/repos/libports/recipes/api/spark/hash
@@ -0,0 +1 @@
+2019-01-29 63905bc1bf4bb45aade024e1631dfd14b305c84b
diff --git a/repos/libports/recipes/pkg/test-ada/archives b/repos/libports/recipes/pkg/test-ada/archives
deleted file mode 100644
index 5200c07f16..0000000000
--- a/repos/libports/recipes/pkg/test-ada/archives
+++ /dev/null
@@ -1,3 +0,0 @@
-_/src/init
-_/src/test-ada
-_/src/ada
diff --git a/repos/libports/recipes/pkg/test-ada/hash b/repos/libports/recipes/pkg/test-ada/hash
deleted file mode 100644
index 1438c30f89..0000000000
--- a/repos/libports/recipes/pkg/test-ada/hash
+++ /dev/null
@@ -1 +0,0 @@
-2019-02-05 0966645d90d6eab87da8951d61022e3248f61c06
diff --git a/repos/libports/recipes/pkg/test-ada_exception/archives b/repos/libports/recipes/pkg/test-ada_exception/archives
deleted file mode 100644
index 7be1d15c54..0000000000
--- a/repos/libports/recipes/pkg/test-ada_exception/archives
+++ /dev/null
@@ -1,3 +0,0 @@
-_/src/init
-_/src/test-ada_exception
-_/src/ada
diff --git a/repos/libports/recipes/pkg/test-ada_exception/hash b/repos/libports/recipes/pkg/test-ada_exception/hash
deleted file mode 100644
index 5f21f442e5..0000000000
--- a/repos/libports/recipes/pkg/test-ada_exception/hash
+++ /dev/null
@@ -1 +0,0 @@
-2019-02-05 9cfdc496cd58731e3a80bb1bca37b4fc1518bace
diff --git a/repos/libports/recipes/pkg/test-ada_secondary_stack/archives b/repos/libports/recipes/pkg/test-ada_secondary_stack/archives
deleted file mode 100644
index daf4d6b91e..0000000000
--- a/repos/libports/recipes/pkg/test-ada_secondary_stack/archives
+++ /dev/null
@@ -1,3 +0,0 @@
-_/src/init
-_/src/test-ada_secondary_stack
-_/src/ada
diff --git a/repos/libports/recipes/pkg/test-ada_secondary_stack/hash b/repos/libports/recipes/pkg/test-ada_secondary_stack/hash
deleted file mode 100644
index d402c8f657..0000000000
--- a/repos/libports/recipes/pkg/test-ada_secondary_stack/hash
+++ /dev/null
@@ -1 +0,0 @@
-2019-02-05 4b84ad134f8c1386d31c38aec76e82ca2be256c8
diff --git a/repos/libports/recipes/pkg/test-gnatio/archives b/repos/libports/recipes/pkg/test-gnatio/archives
index ef671c93db..de85ebc81e 100644
--- a/repos/libports/recipes/pkg/test-gnatio/archives
+++ b/repos/libports/recipes/pkg/test-gnatio/archives
@@ -1,4 +1,4 @@
 _/src/init
 _/src/test-gnatio
-_/src/ada
+_/src/spark
 _/src/log_terminal
diff --git a/repos/libports/recipes/pkg/test-gnatio/runtime b/repos/libports/recipes/pkg/test-gnatio/runtime
index 8b4de37faa..41c3f71a7a 100644
--- a/repos/libports/recipes/pkg/test-gnatio/runtime
+++ b/repos/libports/recipes/pkg/test-gnatio/runtime
@@ -7,7 +7,7 @@
 
 	<content>
 		<rom label="ld.lib.so"/>
-		<rom label="ada.lib.so"/>
+		<rom label="spark.lib.so"/>
 		<rom label="test-gnatio"/>
 		<rom label="log_terminal"/>
 	</content>
diff --git a/repos/libports/recipes/pkg/test-ada/README b/repos/libports/recipes/pkg/test-spark/README
similarity index 100%
rename from repos/libports/recipes/pkg/test-ada/README
rename to repos/libports/recipes/pkg/test-spark/README
diff --git a/repos/libports/recipes/pkg/test-spark/archives b/repos/libports/recipes/pkg/test-spark/archives
new file mode 100644
index 0000000000..e5e1f4608b
--- /dev/null
+++ b/repos/libports/recipes/pkg/test-spark/archives
@@ -0,0 +1,3 @@
+_/src/init
+_/src/test-spark
+_/src/spark
diff --git a/repos/libports/recipes/pkg/test-spark/hash b/repos/libports/recipes/pkg/test-spark/hash
new file mode 100644
index 0000000000..b25694a458
--- /dev/null
+++ b/repos/libports/recipes/pkg/test-spark/hash
@@ -0,0 +1 @@
+2019-01-29 1715f0cbde7f27338678e6e215b074ac9ea55dc0
diff --git a/repos/libports/recipes/pkg/test-ada/runtime b/repos/libports/recipes/pkg/test-spark/runtime
similarity index 74%
rename from repos/libports/recipes/pkg/test-ada/runtime
rename to repos/libports/recipes/pkg/test-spark/runtime
index 7a61f6867f..01a8da48e0 100644
--- a/repos/libports/recipes/pkg/test-ada/runtime
+++ b/repos/libports/recipes/pkg/test-spark/runtime
@@ -2,13 +2,13 @@
 
 	<events>
 		<timeout meaning="failed" sec="20" />
-		<log meaning="succeeded">child "test-ada" exited with exit value 0</log>
+		<log meaning="succeeded">child "test-spark" exited with exit value 0</log>
 	</events>
 
 	<content>
 		<rom label="ld.lib.so"/>
-		<rom label="ada.lib.so"/>
-		<rom label="test-ada"/>
+		<rom label="spark.lib.so"/>
+		<rom label="test-spark"/>
 	</content>
 
 	<config>
@@ -22,7 +22,7 @@
 			<any-service> <parent/> </any-service>
 		</default-route>
 		<default caps="100"/>
-		<start name="test-ada">
+		<start name="test-spark">
 			<resource name="RAM" quantum="10M"/>
 		</start>
 	</config>
diff --git a/repos/libports/recipes/pkg/test-ada_exception/README b/repos/libports/recipes/pkg/test-spark_exception/README
similarity index 100%
rename from repos/libports/recipes/pkg/test-ada_exception/README
rename to repos/libports/recipes/pkg/test-spark_exception/README
diff --git a/repos/libports/recipes/pkg/test-spark_exception/archives b/repos/libports/recipes/pkg/test-spark_exception/archives
new file mode 100644
index 0000000000..335340a359
--- /dev/null
+++ b/repos/libports/recipes/pkg/test-spark_exception/archives
@@ -0,0 +1,3 @@
+_/src/init
+_/src/test-spark_exception
+_/src/spark
diff --git a/repos/libports/recipes/pkg/test-spark_exception/hash b/repos/libports/recipes/pkg/test-spark_exception/hash
new file mode 100644
index 0000000000..1d1eae8977
--- /dev/null
+++ b/repos/libports/recipes/pkg/test-spark_exception/hash
@@ -0,0 +1 @@
+2019-01-29 2018901ecdaf87894fde67c0e516b697f6f9481c
diff --git a/repos/libports/recipes/pkg/test-ada_exception/runtime b/repos/libports/recipes/pkg/test-spark_exception/runtime
similarity index 57%
rename from repos/libports/recipes/pkg/test-ada_exception/runtime
rename to repos/libports/recipes/pkg/test-spark_exception/runtime
index 95d2ce37d6..829ffdaa2f 100644
--- a/repos/libports/recipes/pkg/test-ada_exception/runtime
+++ b/repos/libports/recipes/pkg/test-spark_exception/runtime
@@ -3,17 +3,17 @@
 	<events>
 		<timeout meaning="failed" sec="20" />
 		<log meaning="succeeded">
-			[init -> test-ada_exception] Ada exception test*
-			[init -> test-ada_exception] Error: Exception raised: explicit raise in except.adb: 6
-			[init -> test-ada_exception] Caught Ada::Exception::Program_Error*
-			[init] child "test-ada_exception" exited with exit value 0
+			[init -> test-spark_exception] Ada exception test*
+			[init -> test-spark_exception] Error: Exception raised: explicit raise in except.adb: 6
+			[init -> test-spark_exception] Caught Ada::Exception::Program_Error*
+			[init] child "test-spark_exception" exited with exit value 0
 		</log>
 	</events>
 
 	<content>
 		<rom label="ld.lib.so"/>
-		<rom label="ada.lib.so"/>
-		<rom label="test-ada_exception"/>
+		<rom label="spark.lib.so"/>
+		<rom label="test-spark_exception"/>
 	</content>
 
 	<config>
@@ -27,7 +27,7 @@
 			<any-service> <parent/> </any-service>
 		</default-route>
 		<default caps="100"/>
-		<start name="test-ada_exception">
+		<start name="test-spark_exception">
 			<resource name="RAM" quantum="10M"/>
 		</start>
 	</config>
diff --git a/repos/libports/recipes/pkg/test-ada_secondary_stack/README b/repos/libports/recipes/pkg/test-spark_secondary_stack/README
similarity index 100%
rename from repos/libports/recipes/pkg/test-ada_secondary_stack/README
rename to repos/libports/recipes/pkg/test-spark_secondary_stack/README
diff --git a/repos/libports/recipes/pkg/test-spark_secondary_stack/archives b/repos/libports/recipes/pkg/test-spark_secondary_stack/archives
new file mode 100644
index 0000000000..d0d66a596f
--- /dev/null
+++ b/repos/libports/recipes/pkg/test-spark_secondary_stack/archives
@@ -0,0 +1,3 @@
+_/src/init
+_/src/test-spark_secondary_stack
+_/src/spark
diff --git a/repos/libports/recipes/pkg/test-spark_secondary_stack/hash b/repos/libports/recipes/pkg/test-spark_secondary_stack/hash
new file mode 100644
index 0000000000..943af7fc9d
--- /dev/null
+++ b/repos/libports/recipes/pkg/test-spark_secondary_stack/hash
@@ -0,0 +1 @@
+2019-01-29 a0dc8be93bd22ba7a2efed4fadf7f8ee4065cdb4
diff --git a/repos/libports/recipes/pkg/test-ada_secondary_stack/runtime b/repos/libports/recipes/pkg/test-spark_secondary_stack/runtime
similarity index 66%
rename from repos/libports/recipes/pkg/test-ada_secondary_stack/runtime
rename to repos/libports/recipes/pkg/test-spark_secondary_stack/runtime
index dda8463c8c..40d659e4b7 100644
--- a/repos/libports/recipes/pkg/test-ada_secondary_stack/runtime
+++ b/repos/libports/recipes/pkg/test-spark_secondary_stack/runtime
@@ -3,15 +3,15 @@
 	<events>
 		<timeout meaning="failed" sec="20" />
 		<log meaning="succeeded">
-			[init -> test-ada_secondary_stack] secondary stack test successful
-			[init] child "test-ada_secondary_stack" exited with exit value 0
+			[init -> test-spark_secondary_stack] secondary stack test successful
+			[init] child "test-spark_secondary_stack" exited with exit value 0
 		</log>
 	</events>
 
 	<content>
 		<rom label="ld.lib.so"/>
-		<rom label="ada.lib.so"/>
-		<rom label="test-ada_secondary_stack"/>
+		<rom label="spark.lib.so"/>
+		<rom label="test-spark_secondary_stack"/>
 	</content>
 
 	<config>
@@ -25,7 +25,7 @@
 			<any-service> <parent/> </any-service>
 		</default-route>
 		<default caps="100"/>
-		<start name="test-ada_secondary_stack">
+		<start name="test-spark_secondary_stack">
 			<resource name="RAM" quantum="10M"/>
 		</start>
 	</config>
diff --git a/repos/libports/recipes/src/ada/api b/repos/libports/recipes/src/ada/api
deleted file mode 100644
index 1208c8ad81..0000000000
--- a/repos/libports/recipes/src/ada/api
+++ /dev/null
@@ -1 +0,0 @@
-ada
diff --git a/repos/libports/recipes/src/ada/hash b/repos/libports/recipes/src/ada/hash
deleted file mode 100644
index bba050f8e1..0000000000
--- a/repos/libports/recipes/src/ada/hash
+++ /dev/null
@@ -1 +0,0 @@
-2019-02-05 4e40d13626ba0c64c5d049de73432f9488c453a6
diff --git a/repos/libports/recipes/src/spark/api b/repos/libports/recipes/src/spark/api
new file mode 100644
index 0000000000..c46a7bbed7
--- /dev/null
+++ b/repos/libports/recipes/src/spark/api
@@ -0,0 +1 @@
+spark
diff --git a/repos/libports/recipes/src/ada/content.mk b/repos/libports/recipes/src/spark/content.mk
similarity index 81%
rename from repos/libports/recipes/src/ada/content.mk
rename to repos/libports/recipes/src/spark/content.mk
index 357ce91a0b..8791ab2056 100644
--- a/repos/libports/recipes/src/ada/content.mk
+++ b/repos/libports/recipes/src/spark/content.mk
@@ -25,9 +25,9 @@ $(MIRROR_FROM_ADA_RT_DIR):
 	cp -r $(ADA_RT_DIR)/$@ $@
 
 MIRROR_FROM_REP_DIR := \
-	lib/mk/ada.mk \
-	lib/mk/ada.inc \
-	lib/import/import-ada.mk \
+	lib/mk/spark.mk \
+	lib/mk/spark.inc \
+	lib/import/import-spark.mk \
 	include/ada/exception.h
 
 content: $(MIRROR_FROM_REP_DIR)
@@ -35,8 +35,8 @@ content: $(MIRROR_FROM_REP_DIR)
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-content: src/lib/ada/target.mk
+content: src/lib/spark/target.mk
 
-src/lib/ada/target.mk:
+src/lib/spark/target.mk:
 	mkdir -p $(dir $@)
-	echo "LIBS = ada" > $@
+	echo "LIBS = spark" > $@
diff --git a/repos/libports/recipes/src/spark/hash b/repos/libports/recipes/src/spark/hash
new file mode 100644
index 0000000000..2edc1deba1
--- /dev/null
+++ b/repos/libports/recipes/src/spark/hash
@@ -0,0 +1 @@
+2019-01-29 e51284845e676e98f36af6093bc0bb67da9655e0
diff --git a/repos/libports/recipes/src/ada/used_apis b/repos/libports/recipes/src/spark/used_apis
similarity index 100%
rename from repos/libports/recipes/src/ada/used_apis
rename to repos/libports/recipes/src/spark/used_apis
diff --git a/repos/libports/recipes/src/test-ada/hash b/repos/libports/recipes/src/test-ada/hash
deleted file mode 100644
index dd52d5ab33..0000000000
--- a/repos/libports/recipes/src/test-ada/hash
+++ /dev/null
@@ -1 +0,0 @@
-2019-02-05 eb0d7ed5c6db72eba9a084e27796193806f01ef8
diff --git a/repos/libports/recipes/src/test-ada/used_apis b/repos/libports/recipes/src/test-ada/used_apis
deleted file mode 100644
index ea812e7637..0000000000
--- a/repos/libports/recipes/src/test-ada/used_apis
+++ /dev/null
@@ -1,2 +0,0 @@
-base
-ada
diff --git a/repos/libports/recipes/src/test-ada_exception/content.mk b/repos/libports/recipes/src/test-ada_exception/content.mk
deleted file mode 100644
index 8085010615..0000000000
--- a/repos/libports/recipes/src/test-ada_exception/content.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-#MIRROR_FROM_REP_DIR := \
-#	lib/mk/test-ada.mk \
-#	lib/import/import-test-ada.mk
-#
-#content: $(MIRROR_FROM_REP_DIR)
-#
-#$(MIRROR_FROM_REP_DIR):
-#	$(mirror_from_rep_dir)
-
-
-SRC_DIR = src/test/ada_exception
-
-include $(GENODE_DIR)/repos/base/recipes/src/content.inc
diff --git a/repos/libports/recipes/src/test-ada_exception/hash b/repos/libports/recipes/src/test-ada_exception/hash
deleted file mode 100644
index 44abbef52d..0000000000
--- a/repos/libports/recipes/src/test-ada_exception/hash
+++ /dev/null
@@ -1 +0,0 @@
-2019-02-05 8591b810822392691983ef0d27677bdb63b7a27f
diff --git a/repos/libports/recipes/src/test-ada_exception/used_apis b/repos/libports/recipes/src/test-ada_exception/used_apis
deleted file mode 100644
index ea812e7637..0000000000
--- a/repos/libports/recipes/src/test-ada_exception/used_apis
+++ /dev/null
@@ -1,2 +0,0 @@
-base
-ada
diff --git a/repos/libports/recipes/src/test-ada_secondary_stack/content.mk b/repos/libports/recipes/src/test-ada_secondary_stack/content.mk
deleted file mode 100644
index d6f90d933f..0000000000
--- a/repos/libports/recipes/src/test-ada_secondary_stack/content.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-#MIRROR_FROM_REP_DIR := \
-#	lib/mk/test-ada.mk \
-#	lib/import/import-test-ada.mk
-#
-#content: $(MIRROR_FROM_REP_DIR)
-#
-#$(MIRROR_FROM_REP_DIR):
-#	$(mirror_from_rep_dir)
-
-
-SRC_DIR = src/test/ada_secondary_stack
-
-include $(GENODE_DIR)/repos/base/recipes/src/content.inc
diff --git a/repos/libports/recipes/src/test-ada_secondary_stack/hash b/repos/libports/recipes/src/test-ada_secondary_stack/hash
deleted file mode 100644
index 4048ceb519..0000000000
--- a/repos/libports/recipes/src/test-ada_secondary_stack/hash
+++ /dev/null
@@ -1 +0,0 @@
-2019-02-05 06269d42844d948e7af853d8bae5250ea6bad88a
diff --git a/repos/libports/recipes/src/test-ada_secondary_stack/used_apis b/repos/libports/recipes/src/test-ada_secondary_stack/used_apis
deleted file mode 100644
index ea812e7637..0000000000
--- a/repos/libports/recipes/src/test-ada_secondary_stack/used_apis
+++ /dev/null
@@ -1,2 +0,0 @@
-base
-ada
diff --git a/repos/libports/recipes/src/test-gnatio/used_apis b/repos/libports/recipes/src/test-gnatio/used_apis
index b0f9cdc43b..1c8e7eedfb 100644
--- a/repos/libports/recipes/src/test-gnatio/used_apis
+++ b/repos/libports/recipes/src/test-gnatio/used_apis
@@ -1,3 +1,3 @@
 base
-ada
+spark
 terminal_session
diff --git a/repos/libports/recipes/src/test-ada/content.mk b/repos/libports/recipes/src/test-spark/content.mk
similarity index 67%
rename from repos/libports/recipes/src/test-ada/content.mk
rename to repos/libports/recipes/src/test-spark/content.mk
index cecee599c5..293bc10db4 100644
--- a/repos/libports/recipes/src/test-ada/content.mk
+++ b/repos/libports/recipes/src/test-spark/content.mk
@@ -1,6 +1,6 @@
 MIRROR_FROM_REP_DIR := \
-	lib/mk/test-ada.mk \
-	lib/import/import-test-ada.mk
+	lib/mk/test-spark.mk \
+	lib/import/import-test-spark.mk
 
 content: $(MIRROR_FROM_REP_DIR)
 
@@ -8,6 +8,6 @@ $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
 
-SRC_DIR = src/test/ada
+SRC_DIR = src/test/spark
 
 include $(GENODE_DIR)/repos/base/recipes/src/content.inc
diff --git a/repos/libports/recipes/src/test-spark/hash b/repos/libports/recipes/src/test-spark/hash
new file mode 100644
index 0000000000..b2cd814a69
--- /dev/null
+++ b/repos/libports/recipes/src/test-spark/hash
@@ -0,0 +1 @@
+2019-01-29 731bd8b8a5180e68af4be2a078ed89ad3dfde616
diff --git a/repos/libports/recipes/src/test-spark/used_apis b/repos/libports/recipes/src/test-spark/used_apis
new file mode 100644
index 0000000000..da768300f0
--- /dev/null
+++ b/repos/libports/recipes/src/test-spark/used_apis
@@ -0,0 +1,2 @@
+base
+spark
diff --git a/repos/libports/recipes/src/test-spark_exception/content.mk b/repos/libports/recipes/src/test-spark_exception/content.mk
new file mode 100644
index 0000000000..64e82c81cc
--- /dev/null
+++ b/repos/libports/recipes/src/test-spark_exception/content.mk
@@ -0,0 +1,3 @@
+SRC_DIR = src/test/spark_exception
+
+include $(GENODE_DIR)/repos/base/recipes/src/content.inc
diff --git a/repos/libports/recipes/src/test-spark_exception/hash b/repos/libports/recipes/src/test-spark_exception/hash
new file mode 100644
index 0000000000..9a24a67472
--- /dev/null
+++ b/repos/libports/recipes/src/test-spark_exception/hash
@@ -0,0 +1 @@
+2019-01-29 59374f58e03b9cdabdaae070203b103c9d0af2bd
diff --git a/repos/libports/recipes/src/test-spark_exception/used_apis b/repos/libports/recipes/src/test-spark_exception/used_apis
new file mode 100644
index 0000000000..da768300f0
--- /dev/null
+++ b/repos/libports/recipes/src/test-spark_exception/used_apis
@@ -0,0 +1,2 @@
+base
+spark
diff --git a/repos/libports/recipes/src/test-spark_secondary_stack/content.mk b/repos/libports/recipes/src/test-spark_secondary_stack/content.mk
new file mode 100644
index 0000000000..a30a8d82b5
--- /dev/null
+++ b/repos/libports/recipes/src/test-spark_secondary_stack/content.mk
@@ -0,0 +1,3 @@
+SRC_DIR = src/test/spark_secondary_stack
+
+include $(GENODE_DIR)/repos/base/recipes/src/content.inc
diff --git a/repos/libports/recipes/src/test-spark_secondary_stack/hash b/repos/libports/recipes/src/test-spark_secondary_stack/hash
new file mode 100644
index 0000000000..48f320d79b
--- /dev/null
+++ b/repos/libports/recipes/src/test-spark_secondary_stack/hash
@@ -0,0 +1 @@
+2019-01-29 3a2d2bb1d8c93c47d799b315fb4dd9845c7823c4
diff --git a/repos/libports/recipes/src/test-spark_secondary_stack/used_apis b/repos/libports/recipes/src/test-spark_secondary_stack/used_apis
new file mode 100644
index 0000000000..da768300f0
--- /dev/null
+++ b/repos/libports/recipes/src/test-spark_secondary_stack/used_apis
@@ -0,0 +1,2 @@
+base
+spark
diff --git a/repos/libports/src/test/ada/lib/add_package.adb b/repos/libports/src/test/ada/lib/add_package.adb
deleted file mode 100644
index 9abb60c1d3..0000000000
--- a/repos/libports/src/test/ada/lib/add_package.adb
+++ /dev/null
@@ -1,14 +0,0 @@
-package body add_package is
-
-procedure Add(A: in Integer;
-              B: in Integer;
-              R: out Integer)
-is
-	procedure ext_c_print_add(a, b : Integer; result : out Integer);
-	pragma import(C, ext_c_print_add, "print_add");
-begin
-    ext_c_print_add(A, B, R);
-    R := A + B;
-end Add;
-
-end add_package;
diff --git a/repos/libports/src/test/gnatio/target.mk b/repos/libports/src/test/gnatio/target.mk
index 57cb43d1ff..f9811ba122 100644
--- a/repos/libports/src/test/gnatio/target.mk
+++ b/repos/libports/src/test/gnatio/target.mk
@@ -1,4 +1,4 @@
 TARGET   = test-gnatio
 SRC_ADB  = main.adb
 SRC_CC   = startup.cc
-LIBS     = base ada
+LIBS     = base spark
diff --git a/repos/libports/src/test/ada/README b/repos/libports/src/test/spark/README
similarity index 100%
rename from repos/libports/src/test/ada/README
rename to repos/libports/src/test/spark/README
diff --git a/repos/libports/src/test/spark/lib/add_package.adb b/repos/libports/src/test/spark/lib/add_package.adb
new file mode 100644
index 0000000000..7974654d3a
--- /dev/null
+++ b/repos/libports/src/test/spark/lib/add_package.adb
@@ -0,0 +1,14 @@
+package body add_package is
+
+procedure Add (A : in Integer;
+               B : in Integer;
+               R : out Integer)
+is
+	procedure Ext_C_Print_Add (A, B : Integer; Result : out Integer);
+	pragma Import (C, Ext_C_Print_Add, "print_add");
+begin
+    Ext_C_Print_Add (A, B, R);
+    R := R + 1;
+end Add;
+
+end add_package;
diff --git a/repos/libports/src/test/ada/lib/add_package.ads b/repos/libports/src/test/spark/lib/add_package.ads
similarity index 100%
rename from repos/libports/src/test/ada/lib/add_package.ads
rename to repos/libports/src/test/spark/lib/add_package.ads
diff --git a/repos/libports/src/test/ada/machinery.adb b/repos/libports/src/test/spark/machinery.adb
similarity index 100%
rename from repos/libports/src/test/ada/machinery.adb
rename to repos/libports/src/test/spark/machinery.adb
diff --git a/repos/libports/src/test/ada/machinery.ads b/repos/libports/src/test/spark/machinery.ads
similarity index 100%
rename from repos/libports/src/test/ada/machinery.ads
rename to repos/libports/src/test/spark/machinery.ads
diff --git a/repos/libports/src/test/ada/machinery.h b/repos/libports/src/test/spark/machinery.h
similarity index 100%
rename from repos/libports/src/test/ada/machinery.h
rename to repos/libports/src/test/spark/machinery.h
diff --git a/repos/libports/src/test/ada/main.adb b/repos/libports/src/test/spark/main.adb
similarity index 100%
rename from repos/libports/src/test/ada/main.adb
rename to repos/libports/src/test/spark/main.adb
diff --git a/repos/libports/src/test/ada/print.cc b/repos/libports/src/test/spark/print.cc
similarity index 100%
rename from repos/libports/src/test/ada/print.cc
rename to repos/libports/src/test/spark/print.cc
diff --git a/repos/libports/src/test/ada/spark.adc b/repos/libports/src/test/spark/spark.adc
similarity index 100%
rename from repos/libports/src/test/ada/spark.adc
rename to repos/libports/src/test/spark/spark.adc
diff --git a/repos/libports/src/test/ada/startup.cc b/repos/libports/src/test/spark/startup.cc
similarity index 100%
rename from repos/libports/src/test/ada/startup.cc
rename to repos/libports/src/test/spark/startup.cc
diff --git a/repos/libports/src/test/ada/target.mk b/repos/libports/src/test/spark/target.mk
similarity index 74%
rename from repos/libports/src/test/ada/target.mk
rename to repos/libports/src/test/spark/target.mk
index 0dcc8da53c..9e7dc11722 100644
--- a/repos/libports/src/test/ada/target.mk
+++ b/repos/libports/src/test/spark/target.mk
@@ -1,7 +1,7 @@
-TARGET   = test-ada
+TARGET   = test-spark
 SRC_ADB  = main.adb machinery.adb
 SRC_CC   = print.cc startup.cc
-LIBS     = base ada test-ada
+LIBS     = base spark test-spark
 
 CC_ADA_OPT += -gnatec=$(PRG_DIR)/spark.adc
 
diff --git a/repos/libports/src/test/ada_exception/except.adb b/repos/libports/src/test/spark_exception/except.adb
similarity index 100%
rename from repos/libports/src/test/ada_exception/except.adb
rename to repos/libports/src/test/spark_exception/except.adb
diff --git a/repos/libports/src/test/ada_exception/except.ads b/repos/libports/src/test/spark_exception/except.ads
similarity index 100%
rename from repos/libports/src/test/ada_exception/except.ads
rename to repos/libports/src/test/spark_exception/except.ads
diff --git a/repos/libports/src/test/ada_exception/main.cc b/repos/libports/src/test/spark_exception/main.cc
similarity index 100%
rename from repos/libports/src/test/ada_exception/main.cc
rename to repos/libports/src/test/spark_exception/main.cc
diff --git a/repos/libports/src/test/ada_exception/target.mk b/repos/libports/src/test/spark_exception/target.mk
similarity index 53%
rename from repos/libports/src/test/ada_exception/target.mk
rename to repos/libports/src/test/spark_exception/target.mk
index 34d19273ed..e8f8a9fba1 100644
--- a/repos/libports/src/test/ada_exception/target.mk
+++ b/repos/libports/src/test/spark_exception/target.mk
@@ -1,5 +1,5 @@
-TARGET   = test-ada_exception
+TARGET   = test-spark_exception
 SRC_ADB  = except.adb
 SRC_CC   = main.cc
-LIBS     = base ada
+LIBS     = base spark
 INC_DIR += $(PRG_DIR)
diff --git a/repos/libports/src/test/ada_secondary_stack/main.cc b/repos/libports/src/test/spark_secondary_stack/main.cc
similarity index 100%
rename from repos/libports/src/test/ada_secondary_stack/main.cc
rename to repos/libports/src/test/spark_secondary_stack/main.cc
diff --git a/repos/libports/src/test/ada_secondary_stack/stack.adb b/repos/libports/src/test/spark_secondary_stack/stack.adb
similarity index 94%
rename from repos/libports/src/test/ada_secondary_stack/stack.adb
rename to repos/libports/src/test/spark_secondary_stack/stack.adb
index 699579a42f..a063951510 100644
--- a/repos/libports/src/test/ada_secondary_stack/stack.adb
+++ b/repos/libports/src/test/spark_secondary_stack/stack.adb
@@ -29,6 +29,7 @@ is
     is
         R : constant Integer := 0;
         B : Buffer := Recursive_Alloc (R);
+        pragma Unreferenced (B);
     begin
         null;
     end Ralloc;
@@ -68,6 +69,7 @@ is
     is
         S : constant Integer := 16;
         B : Buffer := Stage_1 (S);
+        pragma Unreferenced (B);
     begin
         Print_Stage (0);
     end Salloc;
@@ -107,7 +109,7 @@ is
                       Size : Integer
                      ) return Buffer
     is
-        Buf : Buffer (1 .. Size) := (others => '3');
+        Buf : constant Buffer (1 .. Size) := (others => '3');
     begin
         Print_Stage (3);
         return Buf;
diff --git a/repos/libports/src/test/ada_secondary_stack/stack.ads b/repos/libports/src/test/spark_secondary_stack/stack.ads
similarity index 100%
rename from repos/libports/src/test/ada_secondary_stack/stack.ads
rename to repos/libports/src/test/spark_secondary_stack/stack.ads
diff --git a/repos/libports/src/test/ada_secondary_stack/stack.gpr b/repos/libports/src/test/spark_secondary_stack/stack.gpr
similarity index 100%
rename from repos/libports/src/test/ada_secondary_stack/stack.gpr
rename to repos/libports/src/test/spark_secondary_stack/stack.gpr
diff --git a/repos/libports/src/test/ada_secondary_stack/target.mk b/repos/libports/src/test/spark_secondary_stack/target.mk
similarity index 51%
rename from repos/libports/src/test/ada_secondary_stack/target.mk
rename to repos/libports/src/test/spark_secondary_stack/target.mk
index 254cc8798f..b8cdae904f 100644
--- a/repos/libports/src/test/ada_secondary_stack/target.mk
+++ b/repos/libports/src/test/spark_secondary_stack/target.mk
@@ -1,6 +1,6 @@
-TARGET   = test-ada_secondary_stack
+TARGET   = test-spark_secondary_stack
 SRC_ADB  = stack.adb
 SRC_CC   = main.cc
-LIBS     = base ada
+LIBS     = base spark
 
 INC_DIR += $(PRG_DIR)