diff --git a/world/adventure.cpp b/world/adventure.cpp
index d7874ad87..f9bf01882 100644
--- a/world/adventure.cpp
+++ b/world/adventure.cpp
@@ -28,20 +28,17 @@ Adventure::Adventure(AdventureTemplate *t)
 	instance_id = 0;
 }
 
-Adventure::Adventure(AdventureTemplate *t, int count, int assassination_count, AdventureStatus status, uint16 instance_id, uint32 time_left)
+Adventure::Adventure(AdventureTemplate *t, int in_count, int in_assassination_count, AdventureStatus in_status, uint16 in_instance_id, uint32 time_left)
 {
 	adventure_template = t;
-	count = count;
-	assassination_count = assassination_count;
-	status = status;
-	instance_id = instance_id;
+	count = in_count;
+	assassination_count = in_assassination_count;
+	status = in_status;
+	instance_id = in_instance_id;
 
-	if(status == AS_Finished)
-	{
+	if (in_status == AS_Finished) {
 		database.SetInstanceDuration(instance_id, time_left);
-	}
-	else
-	{
+	} else {
 		database.SetInstanceDuration(instance_id, time_left + 60);
 	}
 
diff --git a/world/adventure.h b/world/adventure.h
index 23255a5b5..ffc9afd9f 100644
--- a/world/adventure.h
+++ b/world/adventure.h
@@ -65,7 +65,7 @@ class Adventure
 {
 public:
 	Adventure(AdventureTemplate *t);
-	Adventure(AdventureTemplate *t, int count, int assassination_count, AdventureStatus status, uint16 instance_id, uint32 time_left);
+	Adventure(AdventureTemplate *t, int in_count, int in_assassination_count, AdventureStatus in_status, uint16 in_instance_id, uint32 time_left);
 	~Adventure();
 	bool Process();
 	bool IsActive();
diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp
index 3446ae755..387347dcd 100644
--- a/world/zoneserver.cpp
+++ b/world/zoneserver.cpp
@@ -93,23 +93,23 @@ ZoneServer::~ZoneServer() {
 	}
 }
 
-bool ZoneServer::SetZone(uint32 zone_id, uint32 instance_id, bool is_static_zone) {
+bool ZoneServer::SetZone(uint32 in_zone_id, uint32 in_instance_id, bool is_static_zone) {
 	is_booting_up = false;
 
-	std::string zone_short_name = ZoneName(zone_id, true);
-	std::string zone_long_name = ZoneLongName(zone_id, true);
+	std::string zone_short_name = ZoneName(in_zone_id, true);
+	std::string zone_long_name = ZoneLongName(in_zone_id, true);
 
-	if (zone_id) {
+	if (in_zone_id) {
 		LogInfo(
 			"Setting zone process to Zone: {} ({}) ID: {}{}{}",
 			zone_long_name,
 			zone_short_name,
-			zone_id,
+			in_zone_id,
 			(
-				instance_id ?
+				in_instance_id ?
 				fmt::format(
 					" (Instance ID {})",
-					instance_id
+					in_instance_id
 				) :
 				""
 			),
@@ -117,10 +117,10 @@ bool ZoneServer::SetZone(uint32 zone_id, uint32 instance_id, bool is_static_zone
 		);
 	}
 
-	zone_server_zone_id = zone_id;
-	instance_id = instance_id;
-	if (zone_id) {
-		zone_server_previous_zone_id = zone_id;
+	zone_server_zone_id = in_zone_id;
+	instance_id = in_instance_id;
+	if (in_zone_id) {
+		zone_server_previous_zone_id = in_zone_id;
 	}
 
 	if (!zone_server_zone_id) {
@@ -1504,10 +1504,10 @@ void ZoneServer::ChangeWID(uint32 iCharID, uint32 iWID) {
 }
 
 
-void ZoneServer::TriggerBootup(uint32 zone_id, uint32 instance_id, const char* admin_name, bool is_static_zone) {
+void ZoneServer::TriggerBootup(uint32 in_zone_id, uint32 in_instance_id, const char* admin_name, bool is_static_zone) {
 	is_booting_up = true;
-	zone_server_zone_id = zone_id;
-	instance_id = instance_id;
+	zone_server_zone_id = in_zone_id;
+	instance_id = in_instance_id;
 
 	auto pack = new ServerPacket(ServerOP_ZoneBootup, sizeof(ServerZoneStateChange_struct));
 	auto s = (ServerZoneStateChange_struct*) pack->pBuffer;
@@ -1516,12 +1516,12 @@ void ZoneServer::TriggerBootup(uint32 zone_id, uint32 instance_id, const char* a
 		strn0cpy(s->adminname, admin_name, sizeof(s->adminname));
 	}
 
-	s->zoneid = zone_id ? zone_id : GetZoneID();
-	s->instanceid = instance_id;
+	s->zoneid = in_zone_id ? in_zone_id : GetZoneID();
+	s->instanceid = in_instance_id;
 	s->makestatic = is_static_zone;
 	SendPacket(pack);
 	delete pack;
-	LSBootUpdate(zone_id, instance_id);
+	LSBootUpdate(in_zone_id, in_instance_id);
 }
 
 void ZoneServer::IncomingClient(Client* client) {
diff --git a/world/zoneserver.h b/world/zoneserver.h
index dac2e7afb..07fe96e60 100644
--- a/world/zoneserver.h
+++ b/world/zoneserver.h
@@ -40,8 +40,8 @@ public:
 	void		SendEmoteMessage(const char* to, uint32 to_guilddbid, int16 to_minstatus, uint32 type, const char* message, ...);
 	void		SendEmoteMessageRaw(const char* to, uint32 to_guilddbid, int16 to_minstatus, uint32 type, const char* message);
 	void		SendKeepAlive();
-	bool		SetZone(uint32 zone_id, uint32 instance_id = 0, bool is_static_zone = false);
-	void		TriggerBootup(uint32 zone_id = 0, uint32 instance_id = 0, const char* admin_name = 0, bool is_static_zone = false);
+	bool		SetZone(uint32 in_zone_id, uint32 in_instance_id = 0, bool is_static_zone = false);
+	void		TriggerBootup(uint32 in_zone_id = 0, uint32 in_instance_id = 0, const char* admin_name = 0, bool is_static_zone = false);
 	void		Disconnect() { auto handle = tcpc->Handle(); if (handle) { handle->Disconnect(); } }
 	void		IncomingClient(Client* client);
 	void		LSBootUpdate(uint32 zone_id, uint32 instance_id = 0, bool startup = false);