diff --git a/mods/mapgen/init.lua b/mods/mapgen/init.lua
index b66da37e..6afc1f80 100644
--- a/mods/mapgen/init.lua
+++ b/mods/mapgen/init.lua
@@ -49,7 +49,7 @@ minetest.register_biome({
 
 -- Aliases
 
-minetest.register_alias("mapgen_lava_source", "moontest:hlsource")
+minetest.register_alias("mapgen_lava_source", "default:lava_source")
 minetest.register_alias("mapgen_water_source", "moontest:hlsource")
 minetest.register_alias("mapgen_stone", "moontest:stone")
 minetest.register_alias("mapgen_dirt", "moontest:dust")
@@ -129,9 +129,9 @@ minetest.register_on_generated(function(minp, maxp, seed)
 	vm:write_to_map(data)
 end)
 
---make lava delete vacuum nodes nearby so as to allow flowing
+--make liquid delete vacuum nodes nearby so as to allow flowing
 minetest.register_abm({
-	nodenames = {"group:lava"},
+	nodenames = {"group:liquid"},
 	neighbors = {"moontest:vacuum"},
 	interval = 1.0,
 	chance = 1,
diff --git a/mods/moontest/nodes.lua b/mods/moontest/nodes.lua
index 25e58296..764133de 100644
--- a/mods/moontest/nodes.lua
+++ b/mods/moontest/nodes.lua
@@ -108,17 +108,17 @@ minetest.register_node("moontest:waterice", {
 
 minetest.register_node("moontest:hlflowing", {
 	description = "Flowing Hydroponic Liquid",
-	inventory_image = minetest.inventorycube("moontest_hl.png"),
+	inventory_image = minetest.inventorycube("moontest_hl2.png"),
 	drawtype = "flowingliquid",
-	tiles = {"moontest_hl.png"},
+	tiles = {"moontest_hl2.png"},
 	special_tiles = {
 		{
-			image="moontest_hlflowing_animated.png",
+			image="moontest_hlflowing_animated2.png",
 			backface_culling=false,
 			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2}
 		},
 		{
-			image="moontest_hlflowing_animated.png",
+			image="moontest_hlflowing_animated2.png",
 			backface_culling=true,
 			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2}
 		},
@@ -139,17 +139,19 @@ minetest.register_node("moontest:hlflowing", {
 
 minetest.register_node("moontest:hlsource", {
 	description = "Hydroponic Liquid Source",
-	inventory_image = minetest.inventorycube("moontest_hl.png"),
+	inventory_image = minetest.inventorycube("moontest_hl2.png"),
 	drawtype = "liquid",
-	tiles = {"moontest_hl.png"},
+	tiles = {
+		{name="moontest_hlflowing_animated2.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0}}
+	},
 	special_tiles = {
 		{
-			image="moontest_hlflowing_animated.png",
+			image="moontest_hlflowing_animated2.png",
 			backface_culling=false,
 			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2}
 		},
 		{
-			image="moontest_hlflowing_animated.png",
+			image="moontest_hlflowing_animated2.png",
 			backface_culling=true,
 			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2}
 		},
diff --git a/mods/moontest/textures/moontest_hl2.png b/mods/moontest/textures/moontest_hl2.png
new file mode 100644
index 00000000..69815407
Binary files /dev/null and b/mods/moontest/textures/moontest_hl2.png differ
diff --git a/mods/moontest/textures/moontest_hlflowing_animated2.png b/mods/moontest/textures/moontest_hlflowing_animated2.png
new file mode 100644
index 00000000..db2e37b6
Binary files /dev/null and b/mods/moontest/textures/moontest_hlflowing_animated2.png differ