diff --git a/server/linit.cpp b/server/linit.cpp
index c6bd870..7a83db7 100644
--- a/server/linit.cpp
+++ b/server/linit.cpp
@@ -42,7 +42,7 @@
 #include "monster_system_api.hpp"
 #include "network_api.hpp"
 #include "room_system_api.hpp"
-#include "waypoint_system_api.hpp"
+#include "trigger_system_api.hpp"
 
 //these libs are loaded by lua.c and are readily available to any Lua program
 static const luaL_Reg loadedlibs[] = {
@@ -68,7 +68,7 @@ static const luaL_Reg preloadedlibs[] = {
 	{TORTUGA_MONSTER_SYSTEM_API, openMonsterSystemAPI},
 	{TORTUGA_NETWORK_API, openNetworkAPI},
 	{TORTUGA_ROOM_SYSTEM_API, openRoomSystemAPI},
-	{TORTUGA_WAYPOINT_SYSTEM_API, openWaypointSystemAPI},
+	{TORTUGA_TRIGGER_SYSTEM_API, openTriggerSystemAPI},
 	{NULL, NULL}
 };
 
diff --git a/server/main.cpp b/server/main.cpp
index b7a8953..a69dfb0 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -28,7 +28,6 @@
 #include "config_utility.hpp"
 #include "room_manager.hpp"
 #include "udp_network_utility.hpp"
-#include "waypoint_manager.hpp"
 
 #include <stdexcept>
 #include <iostream>
diff --git a/server/makefile b/server/makefile
index 0c8fff1..c579660 100644
--- a/server/makefile
+++ b/server/makefile
@@ -1,5 +1,5 @@
 #include directories
-INCLUDES+=. accounts characters clients entities monsters rooms server_utilities waypoints ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
+INCLUDES+=. accounts characters clients entities monsters rooms server_utilities triggers ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
 
 #libraries
 #the order of the $(LIBS) is important, at least for MinGW
@@ -32,7 +32,7 @@ all: $(OBJ) $(OUT)
 	$(MAKE) -C monsters
 	$(MAKE) -C rooms
 	$(MAKE) -C server_utilities
-	$(MAKE) -C waypoints
+	$(MAKE) -C triggers
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)
diff --git a/server/rooms/makefile b/server/rooms/makefile
index 1e22bde..e428985 100644
--- a/server/rooms/makefile
+++ b/server/rooms/makefile
@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../characters ../entities ../monsters ../server_utilities ../waypoints ../../common/gameplay ../../common/map ../../common/utilities
+INCLUDES+=. ../characters ../entities ../monsters ../server_utilities ../triggers ../../common/gameplay ../../common/map ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
diff --git a/server/rooms/room_api.cpp b/server/rooms/room_api.cpp
index cac2651..17cc8ae 100644
--- a/server/rooms/room_api.cpp
+++ b/server/rooms/room_api.cpp
@@ -59,9 +59,9 @@ static int getMonsterMgr(lua_State* L) {
 	return 1;
 }
 
-static int getWaypointMgr(lua_State* L) {
+static int getTriggerMgr(lua_State* L) {
 	RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
-	lua_pushlightuserdata(L, reinterpret_cast<void*>(room->GetWaypointMgr()) );
+	lua_pushlightuserdata(L, reinterpret_cast<void*>(room->GetTriggerMgr()) );
 	return 1;
 }
 
@@ -95,7 +95,7 @@ static const luaL_Reg roomLib[] = {
 
 	{"GetPager",getPager},
 	{"GetMonsterMgr",getMonsterMgr},
-	{"GetWaypointMgr",getWaypointMgr},
+	{"GetTriggerMgr",getTriggerMgr},
 
 	{"SetOnTick", setOnTick},
 
diff --git a/server/rooms/room_data.cpp b/server/rooms/room_data.cpp
index 14cf328..1529470 100644
--- a/server/rooms/room_data.cpp
+++ b/server/rooms/room_data.cpp
@@ -61,8 +61,8 @@ MonsterManager* RoomData::GetMonsterMgr() {
 	return &monsterMgr;
 }
 
-WaypointManager* RoomData::GetWaypointMgr() {
-	return &waypointMgr;
+TriggerManager* RoomData::GetTriggerMgr() {
+	return &triggerMgr;
 }
 
 std::list<CharacterData*>* RoomData::GetCharacterList() {
@@ -73,7 +73,7 @@ lua_State* RoomData::SetLuaState(lua_State* L) {
 	lua = L;
 	pager.SetLuaState(lua);
 	monsterMgr.SetLuaState(lua);
-	waypointMgr.SetLuaState(lua);
+	triggerMgr.SetLuaState(lua);
 	return lua;
 }
 
diff --git a/server/rooms/room_data.hpp b/server/rooms/room_data.hpp
index 1933e68..dabe81d 100644
--- a/server/rooms/room_data.hpp
+++ b/server/rooms/room_data.hpp
@@ -25,7 +25,7 @@
 #include "character_data.hpp"
 #include "monster_manager.hpp"
 #include "region_pager_lua.hpp"
-#include "waypoint_manager.hpp"
+#include "trigger_manager.hpp"
 
 #include "lua.hpp"
 
@@ -48,7 +48,7 @@ public:
 
 	RegionPagerLua* GetPager();
 	MonsterManager* GetMonsterMgr();
-	WaypointManager* GetWaypointMgr();
+	TriggerManager* GetTriggerMgr();
 	std::list<CharacterData*>* GetCharacterList();
 
 	//API interfaces
@@ -70,7 +70,7 @@ private:
 	//members
 	RegionPagerLua pager;
 	MonsterManager monsterMgr;
-	WaypointManager waypointMgr;
+	TriggerManager triggerMgr;
 	std::list<CharacterData*> characterList;
 
 	//API
diff --git a/server/server_utilities/makefile b/server/server_utilities/makefile
index 879e339..2093a63 100644
--- a/server/server_utilities/makefile
+++ b/server/server_utilities/makefile
@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../accounts ../characters ../clients ../entities ../monsters ../rooms ../waypoints ../../common/gameplay ../../common/map ../../common/network ../../common/network/packet_types ../../common/utilities
+INCLUDES+=. ../accounts ../characters ../clients ../entities ../monsters ../rooms ../triggers ../../common/gameplay ../../common/map ../../common/network ../../common/network/packet_types ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))