diff --git a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/BiSEndpoint.scala b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/BiSEndpoint.scala
index 60bbe3b..0a86d01 100644
--- a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/BiSEndpoint.scala
+++ b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/BiSEndpoint.scala
@@ -132,7 +132,7 @@ class BiSEndpoint(override val storage: ActorRef, ariyala: ActorRef)(implicit ti
         authenticateBasicBCrypt(s"party $partyId", authPost(partyId)) { _ =>
           post {
             entity(as[PieceActionResponse]) { action =>
-              val playerId = action.playerIdResponse.withPartyId(partyId)
+              val playerId = action.playerId.withPartyId(partyId)
               onComplete(doModifyBiS(action.action, playerId, action.piece.toPiece)) {
                 case Success(_) => complete(StatusCodes.Accepted, HttpEntity.Empty)
                 case Failure(exception) => throw exception
diff --git a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/LootEndpoint.scala b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/LootEndpoint.scala
index 76d5566..53c8092 100644
--- a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/LootEndpoint.scala
+++ b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/LootEndpoint.scala
@@ -95,7 +95,7 @@ class LootEndpoint(override val storage: ActorRef)(implicit timeout: Timeout)
         authenticateBasicBCrypt(s"party $partyId", authPost(partyId)) { _ =>
           post {
             entity(as[PieceActionResponse]) { action =>
-              val playerId = action.playerIdResponse.withPartyId(partyId)
+              val playerId = action.playerId.withPartyId(partyId)
               onComplete(doModifyLoot(action.action, playerId, action.piece.toPiece)) {
                 case Success(_) => complete(StatusCodes.Accepted, HttpEntity.Empty)
                 case Failure(exception) => throw exception
diff --git a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/PlayerEndpoint.scala b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/PlayerEndpoint.scala
index 12f9749..c2dc7ef 100644
--- a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/PlayerEndpoint.scala
+++ b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/PlayerEndpoint.scala
@@ -94,7 +94,7 @@ class PlayerEndpoint(override val storage: ActorRef, ariyala: ActorRef)(implicit
       extractExecutionContext { implicit executionContext =>
         authenticateBasicBCrypt(s"party $partyId", authPost(partyId)) { _ =>
           entity(as[PlayerActionResponse]) { action =>
-            val player = action.playerIdResponse.toPlayer.copy(partyId = partyId)
+            val player = action.playerId.toPlayer.copy(partyId = partyId)
             onComplete(doModifyPlayer(action.action, player)) {
               case Success(_) => complete(StatusCodes.Accepted, HttpEntity.Empty)
               case Failure(exception) => throw exception
diff --git a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PieceActionResponse.scala b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PieceActionResponse.scala
index 6769689..fe397e5 100644
--- a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PieceActionResponse.scala
+++ b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PieceActionResponse.scala
@@ -13,4 +13,4 @@ import io.swagger.v3.oas.annotations.media.Schema
 case class PieceActionResponse(
   @Schema(description = "action to perform", required = true, `type` = "string", allowableValues = Array("add", "remove")) action: ApiAction.Value,
   @Schema(description = "piece description", required = true) piece: PieceResponse,
-  @Schema(description = "player description", required = true) playerIdResponse: PlayerIdResponse)
+  @Schema(description = "player description", required = true) playerId: PlayerIdResponse)
diff --git a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PlayerActionResponse.scala b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PlayerActionResponse.scala
index 6f36616..742b1e3 100644
--- a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PlayerActionResponse.scala
+++ b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PlayerActionResponse.scala
@@ -12,4 +12,4 @@ import io.swagger.v3.oas.annotations.media.Schema
 
 case class PlayerActionResponse(
   @Schema(description = "action to perform", required = true, `type` = "string", allowableValues = Array("add", "remove"), example = "add") action: ApiAction.Value,
-  @Schema(description = "player description", required = true) playerIdResponse: PlayerResponse)
+  @Schema(description = "player description", required = true) playerId: PlayerResponse)
diff --git a/src/test/scala/me/arcanis/ffxivbis/Settings.scala b/src/test/scala/me/arcanis/ffxivbis/Settings.scala
index 835cf28..e5c67f6 100644
--- a/src/test/scala/me/arcanis/ffxivbis/Settings.scala
+++ b/src/test/scala/me/arcanis/ffxivbis/Settings.scala
@@ -16,13 +16,13 @@ object Settings {
     replace(default, values.toList)
   }
 
-  def clearDatabase(config: Config): Unit = {
-    val databasePath =
-      config.getString("me.arcanis.ffxivbis.database.sqlite.db.url").split(":").last
-    val databaseFile = new File(databasePath)
-    if (databaseFile.exists)
-      databaseFile.delete()
-  }
+  def clearDatabase(config: Config): Unit =
+    config.getString("me.arcanis.ffxivbis.database.sqlite.db.url").split(":")
+      .lastOption.foreach { databasePath =>
+        val databaseFile = new File(databasePath)
+        if (databaseFile.exists)
+          databaseFile.delete()
+      }
   def randomDatabasePath: String = File.createTempFile("ffxivdb-",".db").toPath.toString
   def withRandomDatabase: Config =
     config(Map("me.arcanis.ffxivbis.database.sqlite.db.url" -> s"jdbc:sqlite:$randomDatabasePath"))