diff --git a/backend/api/Controllers/InspectionFindingsController.cs b/backend/api/Controllers/InspectionFindingController.cs
similarity index 86%
rename from backend/api/Controllers/InspectionFindingsController.cs
rename to backend/api/Controllers/InspectionFindingController.cs
index 8c94dd9cf..fb211f707 100644
--- a/backend/api/Controllers/InspectionFindingsController.cs
+++ b/backend/api/Controllers/InspectionFindingController.cs
@@ -8,8 +8,8 @@ namespace Api.Controllers
 {
     [ApiController]
     [Route("inspection-findings")]
-    public class InspectionFindingsController(
-            ILogger<InspectionFindingsController> logger,
+    public class InspectionFindingController(
+            ILogger<InspectionFindingController> logger,
             IInspectionService inspectionService
         ) : ControllerBase
     {
@@ -27,12 +27,12 @@ IInspectionService inspectionService
         [ProducesResponseType(StatusCodes.Status401Unauthorized)]
         [ProducesResponseType(StatusCodes.Status403Forbidden)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        public async Task<ActionResult<InspectionFinding>> AddFindings([FromBody] InspectionFindingsQuery inspectionFinding, [FromRoute] string isarStepId)
+        public async Task<ActionResult<InspectionFinding>> AddFinding([FromBody] InspectionFindingQuery inspectionFinding, [FromRoute] string isarStepId)
         {
-            logger.LogInformation("Updating inspection findings for inspection with isarStepId '{Id}'", isarStepId);
+            logger.LogInformation("Add inspection finding for inspection with isarStepId '{Id}'", isarStepId);
             try
             {
-                var inspection = await inspectionService.AddFindings(inspectionFinding, isarStepId);
+                var inspection = await inspectionService.AddFinding(inspectionFinding, isarStepId);
 
                 if (inspection != null)
                 {
@@ -42,7 +42,7 @@ public async Task<ActionResult<InspectionFinding>> AddFindings([FromBody] Inspec
             }
             catch (Exception e)
             {
-                logger.LogError(e, "Error while adding findings to inspection with IsarStepId '{Id}'", isarStepId);
+                logger.LogError(e, "Error while adding inspection finding to inspection with IsarStepId '{Id}'", isarStepId);
                 return StatusCode(StatusCodes.Status500InternalServerError);
             }
             return NotFound($"Could not find any inspection with the provided '{isarStepId}'");
diff --git a/backend/api/Controllers/Models/InspectionFindingsQuery.cs b/backend/api/Controllers/Models/InspectionFindingQuery.cs
similarity index 55%
rename from backend/api/Controllers/Models/InspectionFindingsQuery.cs
rename to backend/api/Controllers/Models/InspectionFindingQuery.cs
index e697833cc..6015eee7b 100644
--- a/backend/api/Controllers/Models/InspectionFindingsQuery.cs
+++ b/backend/api/Controllers/Models/InspectionFindingQuery.cs
@@ -1,13 +1,11 @@
 namespace Api.Controllers.Models
 {
-    public struct InspectionFindingsQuery
+    public struct InspectionFindingQuery
     {
 
         public DateTime InspectionDate { get; set; }
 
-        public string Findings { get; set; }
-
-
+        public string Finding { get; set; }
     }
 
 }
diff --git a/backend/api/Database/Models/InspectionFinding.cs b/backend/api/Database/Models/InspectionFinding.cs
index c85f2058d..2feb20373 100644
--- a/backend/api/Database/Models/InspectionFinding.cs
+++ b/backend/api/Database/Models/InspectionFinding.cs
@@ -14,19 +14,19 @@ public class InspectionFinding
 
         public string IsarStepId { get; set; }
 
-        public string Findings { get; set; }
+        public string Finding { get; set; }
 
-        public InspectionFinding(InspectionFindingsQuery createInspectionFindingQuery)
+        public InspectionFinding(InspectionFindingQuery createInspectionFindingQuery)
         {
             InspectionDate = createInspectionFindingQuery.InspectionDate;
-            Findings = createInspectionFindingQuery.Findings;
+            Finding = createInspectionFindingQuery.Finding;
         }
 
         public InspectionFinding()
         {
             InspectionDate = DateTime.UtcNow;
             IsarStepId = "string";
-            Findings = "string";
+            Finding = "string";
         }
     }
 
diff --git a/backend/api/EventHandlers/InspectionFindingsEventHandler.cs b/backend/api/EventHandlers/InspectionFindingEventHandler.cs
similarity index 100%
rename from backend/api/EventHandlers/InspectionFindingsEventHandler.cs
rename to backend/api/EventHandlers/InspectionFindingEventHandler.cs
diff --git a/backend/api/Migrations/20231128111821_FixNamingConventions.Designer.cs b/backend/api/Migrations/20231128111821_FixNamingConventions.Designer.cs
new file mode 100644
index 000000000..144e14674
--- /dev/null
+++ b/backend/api/Migrations/20231128111821_FixNamingConventions.Designer.cs
@@ -0,0 +1,1314 @@
+// <auto-generated />
+using System;
+using Api.Database.Context;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Api.Migrations
+{
+    [DbContext(typeof(FlotillaDbContext))]
+    [Migration("20231128111821_FixNamingConventions")]
+    partial class FixNamingConventions
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Api.Database.Models.Area", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("DeckId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DefaultLocalizationPoseId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("InstallationId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("PlantId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeckId");
+
+                    b.HasIndex("DefaultLocalizationPoseId");
+
+                    b.HasIndex("InstallationId");
+
+                    b.HasIndex("PlantId");
+
+                    b.ToTable("Areas");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Deck", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("DefaultLocalizationPoseId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("InstallationId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("PlantId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DefaultLocalizationPoseId");
+
+                    b.HasIndex("InstallationId");
+
+                    b.HasIndex("PlantId");
+
+                    b.ToTable("Decks");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.DefaultLocalizationPose", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DefaultLocalizationPoses");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Inspection", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("AnalysisType")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("EndTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("InspectionType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InspectionUrl")
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<string>("IsarStepId")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("MissionTaskId")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("StartTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<float?>("VideoDuration")
+                        .HasColumnType("real");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MissionTaskId");
+
+                    b.ToTable("Inspections");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.InspectionFinding", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Finding")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("InspectionDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("InspectionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IsarStepId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InspectionId");
+
+                    b.ToTable("InspectionFindings");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Installation", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InstallationCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InstallationCode")
+                        .IsUnique();
+
+                    b.ToTable("Installations");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.MissionDefinition", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("AreaId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Comment")
+                        .HasMaxLength(1000)
+                        .HasColumnType("character varying(1000)");
+
+                    b.Property<long?>("InspectionFrequency")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("InstallationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeprecated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("LastSuccessfulRunId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("SourceId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AreaId");
+
+                    b.HasIndex("LastSuccessfulRunId");
+
+                    b.HasIndex("SourceId");
+
+                    b.ToTable("MissionDefinitions");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.MissionRun", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("AreaId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Comment")
+                        .HasMaxLength(1000)
+                        .HasColumnType("character varying(1000)");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(450)
+                        .HasColumnType("character varying(450)");
+
+                    b.Property<DateTime>("DesiredStartTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("EndTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<long?>("EstimatedDuration")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("InstallationCode")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("IsarMissionId")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("MissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("MissionRunPriority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("RobotId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("StartTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("StatusReason")
+                        .HasMaxLength(450)
+                        .HasColumnType("character varying(450)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AreaId");
+
+                    b.HasIndex("RobotId");
+
+                    b.ToTable("MissionRuns");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.MissionTask", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(500)
+                        .HasColumnType("character varying(500)");
+
+                    b.Property<int?>("EchoPoseId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("EchoTagLink")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<DateTime?>("EndTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("IsarTaskId")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("MissionRunId")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("StartTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TagId")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<int>("TaskOrder")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MissionRunId");
+
+                    b.ToTable("MissionTasks");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Plant", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InstallationId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("PlantCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InstallationId");
+
+                    b.HasIndex("PlantCode")
+                        .IsUnique();
+
+                    b.ToTable("Plants");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Robot", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<float>("BatteryLevel")
+                        .HasColumnType("real");
+
+                    b.Property<string>("CurrentAreaId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("CurrentInstallation")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CurrentMissionId")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Host")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("IsarId")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<bool>("MissionQueueFrozen")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ModelId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<int>("Port")
+                        .HasColumnType("integer");
+
+                    b.Property<float?>("PressureLevel")
+                        .HasColumnType("real");
+
+                    b.Property<string>("SerialNumber")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CurrentAreaId");
+
+                    b.HasIndex("ModelId");
+
+                    b.ToTable("Robots");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.RobotBatteryTimeseries", b =>
+                {
+                    b.Property<float>("BatteryLevel")
+                        .HasColumnType("real");
+
+                    b.Property<string>("MissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RobotId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.ToTable("RobotBatteryTimeseries");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.RobotModel", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<float?>("AverageDurationPerTag")
+                        .HasColumnType("real");
+
+                    b.Property<float?>("BatteryWarningThreshold")
+                        .HasColumnType("real");
+
+                    b.Property<float?>("LowerPressureWarningThreshold")
+                        .HasColumnType("real");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<float?>("UpperPressureWarningThreshold")
+                        .HasColumnType("real");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Type")
+                        .IsUnique();
+
+                    b.ToTable("RobotModels");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.RobotPoseTimeseries", b =>
+                {
+                    b.Property<string>("MissionId")
+                        .HasColumnType("text");
+
+                    b.Property<float>("OrientationW")
+                        .HasColumnType("real");
+
+                    b.Property<float>("OrientationX")
+                        .HasColumnType("real");
+
+                    b.Property<float>("OrientationY")
+                        .HasColumnType("real");
+
+                    b.Property<float>("OrientationZ")
+                        .HasColumnType("real");
+
+                    b.Property<float>("PositionX")
+                        .HasColumnType("real");
+
+                    b.Property<float>("PositionY")
+                        .HasColumnType("real");
+
+                    b.Property<float>("PositionZ")
+                        .HasColumnType("real");
+
+                    b.Property<string>("RobotId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.ToTable("RobotPoseTimeseries");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.RobotPressureTimeseries", b =>
+                {
+                    b.Property<string>("MissionId")
+                        .HasColumnType("text");
+
+                    b.Property<float>("Pressure")
+                        .HasColumnType("real");
+
+                    b.Property<string>("RobotId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.ToTable("RobotPressureTimeseries");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.SafePosition", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("AreaId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AreaId");
+
+                    b.ToTable("SafePositions");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Source", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SourceId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Sources");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Area", b =>
+                {
+                    b.HasOne("Api.Database.Models.Deck", "Deck")
+                        .WithMany()
+                        .HasForeignKey("DeckId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.HasOne("Api.Database.Models.DefaultLocalizationPose", "DefaultLocalizationPose")
+                        .WithMany()
+                        .HasForeignKey("DefaultLocalizationPoseId");
+
+                    b.HasOne("Api.Database.Models.Installation", "Installation")
+                        .WithMany()
+                        .HasForeignKey("InstallationId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Api.Database.Models.Plant", "Plant")
+                        .WithMany()
+                        .HasForeignKey("PlantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Api.Database.Models.MapMetadata", "MapMetadata", b1 =>
+                        {
+                            b1.Property<string>("AreaId")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("MapName")
+                                .IsRequired()
+                                .HasMaxLength(200)
+                                .HasColumnType("character varying(200)");
+
+                            b1.HasKey("AreaId");
+
+                            b1.ToTable("Areas");
+
+                            b1.WithOwner()
+                                .HasForeignKey("AreaId");
+
+                            b1.OwnsOne("Api.Database.Models.Boundary", "Boundary", b2 =>
+                                {
+                                    b2.Property<string>("MapMetadataAreaId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<double>("X1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("X2")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("Y1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("Y2")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("Z1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("Z2")
+                                        .HasColumnType("double precision");
+
+                                    b2.HasKey("MapMetadataAreaId");
+
+                                    b2.ToTable("Areas");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("MapMetadataAreaId");
+                                });
+
+                            b1.OwnsOne("Api.Database.Models.TransformationMatrices", "TransformationMatrices", b2 =>
+                                {
+                                    b2.Property<string>("MapMetadataAreaId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<double>("C1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("C2")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("D1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("D2")
+                                        .HasColumnType("double precision");
+
+                                    b2.HasKey("MapMetadataAreaId");
+
+                                    b2.ToTable("Areas");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("MapMetadataAreaId");
+                                });
+
+                            b1.Navigation("Boundary")
+                                .IsRequired();
+
+                            b1.Navigation("TransformationMatrices")
+                                .IsRequired();
+                        });
+
+                    b.Navigation("Deck");
+
+                    b.Navigation("DefaultLocalizationPose");
+
+                    b.Navigation("Installation");
+
+                    b.Navigation("MapMetadata")
+                        .IsRequired();
+
+                    b.Navigation("Plant");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Deck", b =>
+                {
+                    b.HasOne("Api.Database.Models.DefaultLocalizationPose", "DefaultLocalizationPose")
+                        .WithMany()
+                        .HasForeignKey("DefaultLocalizationPoseId");
+
+                    b.HasOne("Api.Database.Models.Installation", "Installation")
+                        .WithMany()
+                        .HasForeignKey("InstallationId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Api.Database.Models.Plant", "Plant")
+                        .WithMany()
+                        .HasForeignKey("PlantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("DefaultLocalizationPose");
+
+                    b.Navigation("Installation");
+
+                    b.Navigation("Plant");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.DefaultLocalizationPose", b =>
+                {
+                    b.OwnsOne("Api.Database.Models.Pose", "Pose", b1 =>
+                        {
+                            b1.Property<string>("DefaultLocalizationPoseId")
+                                .HasColumnType("text");
+
+                            b1.HasKey("DefaultLocalizationPoseId");
+
+                            b1.ToTable("DefaultLocalizationPoses");
+
+                            b1.WithOwner()
+                                .HasForeignKey("DefaultLocalizationPoseId");
+
+                            b1.OwnsOne("Api.Database.Models.Orientation", "Orientation", b2 =>
+                                {
+                                    b2.Property<string>("PoseDefaultLocalizationPoseId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<float>("W")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("X")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Y")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Z")
+                                        .HasColumnType("real");
+
+                                    b2.HasKey("PoseDefaultLocalizationPoseId");
+
+                                    b2.ToTable("DefaultLocalizationPoses");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("PoseDefaultLocalizationPoseId");
+                                });
+
+                            b1.OwnsOne("Api.Database.Models.Position", "Position", b2 =>
+                                {
+                                    b2.Property<string>("PoseDefaultLocalizationPoseId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<float>("X")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Y")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Z")
+                                        .HasColumnType("real");
+
+                                    b2.HasKey("PoseDefaultLocalizationPoseId");
+
+                                    b2.ToTable("DefaultLocalizationPoses");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("PoseDefaultLocalizationPoseId");
+                                });
+
+                            b1.Navigation("Orientation")
+                                .IsRequired();
+
+                            b1.Navigation("Position")
+                                .IsRequired();
+                        });
+
+                    b.Navigation("Pose")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Inspection", b =>
+                {
+                    b.HasOne("Api.Database.Models.MissionTask", null)
+                        .WithMany("Inspections")
+                        .HasForeignKey("MissionTaskId");
+
+                    b.OwnsOne("Api.Database.Models.Position", "InspectionTarget", b1 =>
+                        {
+                            b1.Property<string>("InspectionId")
+                                .HasColumnType("text");
+
+                            b1.Property<float>("X")
+                                .HasColumnType("real");
+
+                            b1.Property<float>("Y")
+                                .HasColumnType("real");
+
+                            b1.Property<float>("Z")
+                                .HasColumnType("real");
+
+                            b1.HasKey("InspectionId");
+
+                            b1.ToTable("Inspections");
+
+                            b1.WithOwner()
+                                .HasForeignKey("InspectionId");
+                        });
+
+                    b.Navigation("InspectionTarget")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Api.Database.Models.InspectionFinding", b =>
+                {
+                    b.HasOne("Api.Database.Models.Inspection", null)
+                        .WithMany("InspectionFindings")
+                        .HasForeignKey("InspectionId");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.MissionDefinition", b =>
+                {
+                    b.HasOne("Api.Database.Models.Area", "Area")
+                        .WithMany()
+                        .HasForeignKey("AreaId");
+
+                    b.HasOne("Api.Database.Models.MissionRun", "LastSuccessfulRun")
+                        .WithMany()
+                        .HasForeignKey("LastSuccessfulRunId");
+
+                    b.HasOne("Api.Database.Models.Source", "Source")
+                        .WithMany()
+                        .HasForeignKey("SourceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Area");
+
+                    b.Navigation("LastSuccessfulRun");
+
+                    b.Navigation("Source");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.MissionRun", b =>
+                {
+                    b.HasOne("Api.Database.Models.Area", "Area")
+                        .WithMany()
+                        .HasForeignKey("AreaId");
+
+                    b.HasOne("Api.Database.Models.Robot", "Robot")
+                        .WithMany()
+                        .HasForeignKey("RobotId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsOne("Api.Database.Models.MapMetadata", "Map", b1 =>
+                        {
+                            b1.Property<string>("MissionRunId")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("MapName")
+                                .IsRequired()
+                                .HasMaxLength(200)
+                                .HasColumnType("character varying(200)");
+
+                            b1.HasKey("MissionRunId");
+
+                            b1.ToTable("MissionRuns");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MissionRunId");
+
+                            b1.OwnsOne("Api.Database.Models.Boundary", "Boundary", b2 =>
+                                {
+                                    b2.Property<string>("MapMetadataMissionRunId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<double>("X1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("X2")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("Y1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("Y2")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("Z1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("Z2")
+                                        .HasColumnType("double precision");
+
+                                    b2.HasKey("MapMetadataMissionRunId");
+
+                                    b2.ToTable("MissionRuns");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("MapMetadataMissionRunId");
+                                });
+
+                            b1.OwnsOne("Api.Database.Models.TransformationMatrices", "TransformationMatrices", b2 =>
+                                {
+                                    b2.Property<string>("MapMetadataMissionRunId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<double>("C1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("C2")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("D1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("D2")
+                                        .HasColumnType("double precision");
+
+                                    b2.HasKey("MapMetadataMissionRunId");
+
+                                    b2.ToTable("MissionRuns");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("MapMetadataMissionRunId");
+                                });
+
+                            b1.Navigation("Boundary")
+                                .IsRequired();
+
+                            b1.Navigation("TransformationMatrices")
+                                .IsRequired();
+                        });
+
+                    b.Navigation("Area");
+
+                    b.Navigation("Map");
+
+                    b.Navigation("Robot");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.MissionTask", b =>
+                {
+                    b.HasOne("Api.Database.Models.MissionRun", null)
+                        .WithMany("Tasks")
+                        .HasForeignKey("MissionRunId");
+
+                    b.OwnsOne("Api.Database.Models.Position", "InspectionTarget", b1 =>
+                        {
+                            b1.Property<string>("MissionTaskId")
+                                .HasColumnType("text");
+
+                            b1.Property<float>("X")
+                                .HasColumnType("real");
+
+                            b1.Property<float>("Y")
+                                .HasColumnType("real");
+
+                            b1.Property<float>("Z")
+                                .HasColumnType("real");
+
+                            b1.HasKey("MissionTaskId");
+
+                            b1.ToTable("MissionTasks");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MissionTaskId");
+                        });
+
+                    b.OwnsOne("Api.Database.Models.Pose", "RobotPose", b1 =>
+                        {
+                            b1.Property<string>("MissionTaskId")
+                                .HasColumnType("text");
+
+                            b1.HasKey("MissionTaskId");
+
+                            b1.ToTable("MissionTasks");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MissionTaskId");
+
+                            b1.OwnsOne("Api.Database.Models.Orientation", "Orientation", b2 =>
+                                {
+                                    b2.Property<string>("PoseMissionTaskId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<float>("W")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("X")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Y")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Z")
+                                        .HasColumnType("real");
+
+                                    b2.HasKey("PoseMissionTaskId");
+
+                                    b2.ToTable("MissionTasks");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("PoseMissionTaskId");
+                                });
+
+                            b1.OwnsOne("Api.Database.Models.Position", "Position", b2 =>
+                                {
+                                    b2.Property<string>("PoseMissionTaskId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<float>("X")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Y")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Z")
+                                        .HasColumnType("real");
+
+                                    b2.HasKey("PoseMissionTaskId");
+
+                                    b2.ToTable("MissionTasks");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("PoseMissionTaskId");
+                                });
+
+                            b1.Navigation("Orientation")
+                                .IsRequired();
+
+                            b1.Navigation("Position")
+                                .IsRequired();
+                        });
+
+                    b.Navigation("InspectionTarget")
+                        .IsRequired();
+
+                    b.Navigation("RobotPose")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Plant", b =>
+                {
+                    b.HasOne("Api.Database.Models.Installation", "Installation")
+                        .WithMany()
+                        .HasForeignKey("InstallationId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Installation");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Robot", b =>
+                {
+                    b.HasOne("Api.Database.Models.Area", "CurrentArea")
+                        .WithMany()
+                        .HasForeignKey("CurrentAreaId");
+
+                    b.HasOne("Api.Database.Models.RobotModel", "Model")
+                        .WithMany()
+                        .HasForeignKey("ModelId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsOne("Api.Database.Models.Pose", "Pose", b1 =>
+                        {
+                            b1.Property<string>("RobotId")
+                                .HasColumnType("text");
+
+                            b1.HasKey("RobotId");
+
+                            b1.ToTable("Robots");
+
+                            b1.WithOwner()
+                                .HasForeignKey("RobotId");
+
+                            b1.OwnsOne("Api.Database.Models.Orientation", "Orientation", b2 =>
+                                {
+                                    b2.Property<string>("PoseRobotId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<float>("W")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("X")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Y")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Z")
+                                        .HasColumnType("real");
+
+                                    b2.HasKey("PoseRobotId");
+
+                                    b2.ToTable("Robots");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("PoseRobotId");
+                                });
+
+                            b1.OwnsOne("Api.Database.Models.Position", "Position", b2 =>
+                                {
+                                    b2.Property<string>("PoseRobotId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<float>("X")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Y")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Z")
+                                        .HasColumnType("real");
+
+                                    b2.HasKey("PoseRobotId");
+
+                                    b2.ToTable("Robots");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("PoseRobotId");
+                                });
+
+                            b1.Navigation("Orientation")
+                                .IsRequired();
+
+                            b1.Navigation("Position")
+                                .IsRequired();
+                        });
+
+                    b.OwnsMany("Api.Database.Models.VideoStream", "VideoStreams", b1 =>
+                        {
+                            b1.Property<string>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("text");
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasMaxLength(200)
+                                .HasColumnType("character varying(200)");
+
+                            b1.Property<string>("RobotId")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("ShouldRotate270Clockwise")
+                                .HasColumnType("boolean");
+
+                            b1.Property<string>("Type")
+                                .IsRequired()
+                                .HasMaxLength(64)
+                                .HasColumnType("character varying(64)");
+
+                            b1.Property<string>("Url")
+                                .IsRequired()
+                                .HasMaxLength(200)
+                                .HasColumnType("character varying(200)");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("RobotId");
+
+                            b1.ToTable("VideoStream");
+
+                            b1.WithOwner()
+                                .HasForeignKey("RobotId");
+                        });
+
+                    b.Navigation("CurrentArea");
+
+                    b.Navigation("Model");
+
+                    b.Navigation("Pose")
+                        .IsRequired();
+
+                    b.Navigation("VideoStreams");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.SafePosition", b =>
+                {
+                    b.HasOne("Api.Database.Models.Area", null)
+                        .WithMany("SafePositions")
+                        .HasForeignKey("AreaId");
+
+                    b.OwnsOne("Api.Database.Models.Pose", "Pose", b1 =>
+                        {
+                            b1.Property<string>("SafePositionId")
+                                .HasColumnType("text");
+
+                            b1.HasKey("SafePositionId");
+
+                            b1.ToTable("SafePositions");
+
+                            b1.WithOwner()
+                                .HasForeignKey("SafePositionId");
+
+                            b1.OwnsOne("Api.Database.Models.Orientation", "Orientation", b2 =>
+                                {
+                                    b2.Property<string>("PoseSafePositionId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<float>("W")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("X")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Y")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Z")
+                                        .HasColumnType("real");
+
+                                    b2.HasKey("PoseSafePositionId");
+
+                                    b2.ToTable("SafePositions");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("PoseSafePositionId");
+                                });
+
+                            b1.OwnsOne("Api.Database.Models.Position", "Position", b2 =>
+                                {
+                                    b2.Property<string>("PoseSafePositionId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<float>("X")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Y")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Z")
+                                        .HasColumnType("real");
+
+                                    b2.HasKey("PoseSafePositionId");
+
+                                    b2.ToTable("SafePositions");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("PoseSafePositionId");
+                                });
+
+                            b1.Navigation("Orientation")
+                                .IsRequired();
+
+                            b1.Navigation("Position")
+                                .IsRequired();
+                        });
+
+                    b.Navigation("Pose")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Area", b =>
+                {
+                    b.Navigation("SafePositions");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Inspection", b =>
+                {
+                    b.Navigation("InspectionFindings");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.MissionRun", b =>
+                {
+                    b.Navigation("Tasks");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.MissionTask", b =>
+                {
+                    b.Navigation("Inspections");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/backend/api/Migrations/20231128111821_FixNamingConventions.cs b/backend/api/Migrations/20231128111821_FixNamingConventions.cs
new file mode 100644
index 000000000..f8b84d141
--- /dev/null
+++ b/backend/api/Migrations/20231128111821_FixNamingConventions.cs
@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Api.Migrations
+{
+    /// <inheritdoc />
+    public partial class FixNamingConventions : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "Findings",
+                table: "InspectionFindings",
+                newName: "Finding");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "Finding",
+                table: "InspectionFindings",
+                newName: "Findings");
+        }
+    }
+}
diff --git a/backend/api/Migrations/FlotillaDbContextModelSnapshot.cs b/backend/api/Migrations/FlotillaDbContextModelSnapshot.cs
index 08ef67ba4..343b2c44f 100644
--- a/backend/api/Migrations/FlotillaDbContextModelSnapshot.cs
+++ b/backend/api/Migrations/FlotillaDbContextModelSnapshot.cs
@@ -154,7 +154,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .ValueGeneratedOnAdd()
                         .HasColumnType("text");
 
-                    b.Property<string>("Findings")
+                    b.Property<string>("Finding")
                         .IsRequired()
                         .HasColumnType("text");
 
diff --git a/backend/api/Services/InspectionFindingsService.cs b/backend/api/Services/InspectionFindingService.cs
similarity index 100%
rename from backend/api/Services/InspectionFindingsService.cs
rename to backend/api/Services/InspectionFindingService.cs
diff --git a/backend/api/Services/InspectionService.cs b/backend/api/Services/InspectionService.cs
index e48963bbf..1f3c37822 100644
--- a/backend/api/Services/InspectionService.cs
+++ b/backend/api/Services/InspectionService.cs
@@ -11,7 +11,7 @@ public interface IInspectionService
     {
         public Task<Inspection> UpdateInspectionStatus(string isarStepId, IsarStepStatus isarStepStatus);
         public Task<Inspection?> ReadByIsarStepId(string id);
-        public Task<Inspection?> AddFindings(InspectionFindingsQuery inspectionFindingsQuery, string isarStepId);
+        public Task<Inspection?> AddFinding(InspectionFindingQuery inspectionFindingsQuery, string isarStepId);
 
     }
 
@@ -55,7 +55,7 @@ private IQueryable<Inspection> GetInspections()
             return context.Inspections.Include(inspection => inspection.InspectionFindings);
         }
 
-        public async Task<Inspection?> AddFindings(InspectionFindingsQuery inspectionFindingsQuery, string isarStepId)
+        public async Task<Inspection?> AddFinding(InspectionFindingQuery inspectionFindingQuery, string isarStepId)
         {
 
             var inspection = await ReadByIsarStepId(isarStepId);
@@ -65,16 +65,16 @@ private IQueryable<Inspection> GetInspections()
                 return null;
             }
 
-            var inspectionFindings = new InspectionFinding
+            var inspectionFinding = new InspectionFinding
             {
-                InspectionDate = inspectionFindingsQuery.InspectionDate,
-                Findings = inspectionFindingsQuery.Findings,
+                InspectionDate = inspectionFindingQuery.InspectionDate,
+                Finding = inspectionFindingQuery.Finding,
                 IsarStepId = isarStepId,
             };
 
-            inspection.InspectionFindings.Add(inspectionFindings);
+            inspection.InspectionFindings.Add(inspectionFinding);
             inspection = await Update(inspection);
-            _ = signalRService.SendMessageAsync("Inspection findings added", inspection);
+            _ = signalRService.SendMessageAsync("Inspection finding added", inspection);
             return inspection;
         }
     }