diff --git a/db/migrations/20240314145815_rename_columns_v6.sql b/db/migrations/20240314145815_rename_columns_v6.sql
new file mode 100644
index 0000000..723e33c
--- /dev/null
+++ b/db/migrations/20240314145815_rename_columns_v6.sql
@@ -0,0 +1,237 @@
+-- migrate:up
+alter table public."import" rename column mass_gps_logger_g to gps_logger_mass_g;
+alter table public."import" rename column gps_logger_comment to gps_comment;
+alter table public."import" rename column comments_samples to samples_comment;
+alter table public."import" rename column gls_record_frequency_min to gls_record_frequency_sec;
+alter table public."import" rename column gls_startup_date_gmt to gls_startup_date;
+alter table public."import" rename column gls_startup_time_gmt to gls_startup_time;
+alter table public."import" rename column gls_comments to gls_comment;
+alter table public."import" rename column tdr_mass_g to tdr_logger_mass_g;
+alter table public."import" rename column other_sensor_record_frequency_millisec to other_sensor_record_frequency_sec;
+
+refresh materialized view import_fields with data;
+
+
+create or replace function import_logger_and_logger_instrumentation(new import) returns void language plpgsql
+as $$
+declare
+    tdr_file text;
+begin
+    if new.gps_deployment_date is not null then
+        insert into logger values(
+            new.gps_logger_id,
+            'gps',
+            new.gps_logger_model
+        ) on conflict do nothing;
+        insert into logger_instrumentation values(
+            default,
+            new.gps_logger_id,
+            new.ring_number,
+            new.gps_status,
+            (new.gps_record_frequency_sec)::decimal,
+            (new.gps_logger_mass_g)::decimal,
+            new.gps_attachment_method,
+            new.gps_mount_method,
+            (new.gps_startup_date::date +
+             new.gps_startup_time::time) at time zone
+             new.gps_deployment_retrieval_time_zone,
+            (new.gps_deployment_date::date +
+             new.gps_deployment_time::time) at time zone
+             new.gps_deployment_retrieval_time_zone,
+            case when new.gps_retrieval_date is null then null else
+                (new.gps_retrieval_date::date +
+                 new.gps_retrieval_time::time) at time zone
+                 new.gps_deployment_retrieval_time_zone
+            end,
+            new.gps_raw_datafile_name,
+            null,
+            new.gps_comment
+        );
+    end if;
+    if new.gls_deployment_date is not null then
+        insert into logger values(
+            new.gls_logger_id,
+            'gls',
+            new.gls_logger_model
+        ) on conflict do nothing;
+        insert into logger_instrumentation values(
+            default,
+            new.gls_logger_id,
+            new.ring_number,
+            new.gls_status,
+            (new.gls_record_frequency_sec)::decimal,
+            (new.gls_logger_mass_g)::decimal,
+            new.gls_attachment_method,
+            new.gls_mount_method,
+            (new.gls_startup_date::date +
+             new.gls_startup_time::time) at time zone
+             'UTC',
+            (new.gls_deployment_date::date +
+             new.gls_deployment_time::time) at time zone
+             new.gls_deployment_retrieval_time_zone,
+            case when new.gls_retrieval_date is null then null else
+                (new.gls_retrieval_date::date +
+                 new.gls_retrieval_time::time) at time zone
+                 new.gls_deployment_retrieval_time_zone
+            end,
+            new.gls_raw_datafile_name,
+            case when safe_cast_bool(new.logging_for_seatrack) then 'seatrack' else null end,
+            new.gls_comment
+        );
+    end if;
+    if new.tdr_deployment_date is not null then
+        insert into logger values(
+            new.tdr_logger_id,
+            'tdr',
+            new.tdr_logger_model
+        ) on conflict do nothing;
+        foreach tdr_file in array string_to_array(new.tdr_raw_datafile_name, ';') loop
+            insert into logger_instrumentation values(
+                default,
+                new.tdr_logger_id,
+                new.ring_number,
+                new.tdr_status,
+                (new.tdr_record_frequency_sec)::decimal,
+                (new.tdr_logger_mass_g)::decimal,
+                new.tdr_attachment_method,
+                new.tdr_mount_method,
+                (new.tdr_startup_date::date +
+                new.tdr_startup_time::time) at time zone
+                new.tdr_startup_deployment_retrieval_time_zone,
+                (new.tdr_deployment_date::date +
+                new.tdr_deployment_time::time) at time zone
+                new.tdr_startup_deployment_retrieval_time_zone,
+                case when new.tdr_retrieval_date is null then null else
+                    (new.tdr_retrieval_date::date +
+                    new.tdr_retrieval_time::time) at time zone
+                    new.tdr_startup_deployment_retrieval_time_zone
+                end,
+                tdr_file,
+                null,
+                new.tdr_comment
+            );
+        end loop;
+    end if;
+    if new.other_sensor_deployment_date is not null then
+        insert into logger values(
+            new.other_sensor_logger_id,
+            'other_sensor',
+            new.other_sensor_logger_model
+        ) on conflict do nothing;
+        insert into deployment values(
+            default,
+            new.other_sensor_logger_id,
+            new.ring_number,
+            new.other_sensor_status,
+            (new.other_sensor_record_frequency_sec)::decimal,
+            (new.other_sensor_logger_mass_g)::decimal,
+            new.other_sensor_attachment_method,
+            new.other_sensor_mount_method,
+            (new.other_sensor_startup_date::date +
+             new.other_sensor_startup_time::time) at time zone
+             new.other_sensor_startup_deployment_retrieval_time_zone,
+            (new.other_sensor_deployment_time::date +
+             new.other_sensor_deployment_time::time) at time zone
+             new.other_sensor_startup_deployment_retrieval_time_zone,
+            case when new.other_sensor_retrieval_date is null then null else
+                (new.other_sensor_retrieval_date::date +
+                 new.other_sensor_retrieval_time::time) at time zone
+                 new.other_sensor_startup_deployment_retrieval_time_zone
+            end,
+            new.other_sensor_raw_datafile_name,
+            null,
+            new.other_sensor_comment
+        );
+    end if;
+end;
+$$;
+
+
+CREATE Or replace FUNCTION public.import_deployment_and_chick(new public.import) RETURNS void
+    LANGUAGE plpgsql
+    AS $$
+declare
+    deployment_id int;
+    date date;
+begin
+    date = coalesce(
+        new.gps_deployment_date,
+        new.gls_deployment_date,
+        new.tdr_deployment_date,
+        new.other_sensor_deployment_date
+    )::date;
+    insert into deployment values(
+        default,
+        new.ring_number,
+        date,
+        (new.total_logger_mass_all_loggers_g)::decimal,
+        new.age,
+        new.sex,
+        new.sexing_method,
+        (new.mass_deployment)::int,
+        (new.mass_retrieval)::int,
+        (new.scull)::decimal,
+        (new.tarsus)::decimal,
+        (new.wing)::decimal,
+        (new.culmen)::decimal,
+        (new.gonys)::decimal,
+        new.breeding_stage_deployment,
+        rtrim(new.eggs_deployment, '+')::int,
+        (new.chicks_deployment)::int,
+        new.breeding_stage_retrieval,
+        (new.eggs_retrieval)::int,
+        (new.chicks_retrieval)::int,
+        new.further_chick_measures_available,
+        (new.more_information_on_breeding_success_available)::bool,
+        new.colony,
+        (new.blood_sample)::bool,
+        (new.feather_sample)::bool,
+        (new.other_samples)::bool,
+        new.samples_comment,
+        new.comment,
+        new.other,
+        new.funding_source,
+        new.data_responsible,
+        right(new.eggs_deployment, 1) = '+'
+    ) returning id into deployment_id;
+    if new.chick1_mass_retrieval is not null then
+        insert into chick values(
+            default,
+            deployment_id,
+            ltrim(new.chick1_mass_deployment, '~')::decimal,
+            left(new.chick1_mass_deployment, 1) != '~',
+            (new.chick1_age_deployment_days)::int,
+            ltrim(new.chick1_mass_retrieval, '~')::decimal,
+            left(new.chick1_mass_retrieval, 1) != '~',
+            (new.chick1_age_retrieval_days)::int
+        );
+    end if;
+    if new.chick2_mass_retrieval is not null then
+        insert into chick values(
+            default,
+            deployment_id,
+            ltrim(new.chick2_mass_deployment, '~')::decimal,
+            left(new.chick2_mass_deployment, 1) != '~',
+            (new.chick2_age_deployment_days)::int,
+            ltrim(new.chick2_mass_retrieval, '~')::decimal,
+            left(new.chick2_mass_retrieval, 1) != '~',
+            (new.chick2_age_retrieval_days)::int
+        );
+    end if;
+    if new.chick3_mass_retrieval is not null then
+        insert into chick values(
+            default,
+            deployment_id,
+            ltrim(new.chick3_mass_deployment, '~')::decimal,
+            left(new.chick3_mass_deployment, 1) != '~',
+            (new.chick3_age_deployment_days)::int,
+            ltrim(new.chick3_mass_retrieval, '~')::decimal,
+            left(new.chick3_mass_retrieval, 1) != '~',
+            (new.chick3_age_retrieval_days)::int
+        );
+    end if;
+end;
+$$;
+
+-- migrate:down
+