Use current filter naming scheme

reco.c

@@ -130,7 +130,7 @@ reco_graph_new (Params *params)
     data->reco = make_task (data->pm, "lamino-bp");
     data->slice = make_task (data->pm, "slice");
     data->stats = make_task (data->pm, "measure");
-    data->writer = make_task (data->pm, "writer");
+    data->writer = make_task (data->pm, "write");
 
     fwidth = ((guint) params->px) * 2;
     padded_width = next_power_of_two ((guint32) params->width + 1);
@@ -284,21 +284,21 @@ run_simple_reconstruction (Params *params, gchar **argv)
     g_signal_connect (data->reco, "processed", G_CALLBACK (print_dots), NULL);
 
     /* Set up input */
-    radio_reader = make_task (data->pm, "reader");
+    radio_reader = make_task (data->pm, "read");
     update_reader (radio_reader, params);
 
     if (with_flat_field_correction (params)) {
-        flat_before_reader = make_task (data->pm, "reader");
+        flat_before_reader = make_task (data->pm, "read");
         flat_before_stack = make_task (data->pm, "stack");
         flat_before_median = make_task (data->pm, "flatten");
-        dark_reader = make_task (data->pm, "reader");
+        dark_reader = make_task (data->pm, "read");
         ffc = make_task (data->pm, "flat-field-correction");
         copy = UFO_TASK_NODE (ufo_copy_task_new ());
         sum = make_task (data->pm, "flatten-inplace");
         sum_writer = make_task (data->pm, "writer");
 
         g_object_set (flat_before_reader, "path", params->flats, NULL);
-        g_object_set (flat_before_stack, "num-items", params->num_flats, NULL);
+        g_object_set (flat_before_stack, "number", params->num_flats, NULL);
         g_object_set (dark_reader, "path", params->darks, NULL);
 
         g_object_set (ffc, "dark-scale", params->dark_scale,
@@ -327,14 +327,14 @@ run_simple_reconstruction (Params *params, gchar **argv)
         }
 
         if (params->flats_after != NULL) {
-            flat_after_reader = make_task (data->pm, "reader");
+            flat_after_reader = make_task (data->pm, "read");
             flat_after_stack = make_task (data->pm, "stack");
             flat_after_median = make_task (data->pm, "flatten");
 
             flat_interpolate = make_task (data->pm, "interpolate");
 
             g_object_set (flat_after_reader, "path", params->flats_after, NULL);
-            g_object_set (flat_after_stack, "num-items", params->num_flats, NULL);
+            g_object_set (flat_after_stack, "number", params->num_flats, NULL);
 
             ufo_task_graph_connect_nodes (data->graph, flat_after_reader, flat_after_stack);
             ufo_task_graph_connect_nodes (data->graph, flat_after_stack, flat_after_median);
@@ -473,20 +473,20 @@ run_cached_reconstruction (Params *params, gchar **argv)
         /* fill the cache and reconstruct simultaneously */
         read_graph = UFO_TASK_GRAPH (ufo_task_graph_new ());
 
-        radio_reader = make_task (data->pm, "reader");
+        radio_reader = make_task (data->pm, "read");
         update_reader (radio_reader, params);
         data->output = UFO_TASK_NODE (ufo_output_task_new (2));
 
         if (with_flat_field_correction (params)) {
-            flat_before_reader = make_task (data->pm, "reader");
+            flat_before_reader = make_task (data->pm, "read");
             flat_before_stack = make_task (data->pm, "stack");
             flat_before_median = make_task (data->pm, "flatten");
-            dark_reader = make_task (data->pm, "reader");
+            dark_reader = make_task (data->pm, "read");
             ffc = make_task (data->pm, "flat-field-correction");
 
             g_object_set (dark_reader, "path", params->darks, NULL);
             g_object_set (flat_before_reader, "path", params->flats, NULL);
-            g_object_set (flat_before_stack, "num-items", params->num_flats, NULL);
+            g_object_set (flat_before_stack, "number", params->num_flats, NULL);
 
             g_object_set (ffc,
                           "dark-scale", params->dark_scale,
@@ -500,13 +500,13 @@ run_cached_reconstruction (Params *params, gchar **argv)
             ufo_task_graph_connect_nodes (read_graph, ffc, data->output);
 
             if (params->flats_after) {
-                flat_after_reader = make_task (data->pm, "reader");
+                flat_after_reader = make_task (data->pm, "read");
                 flat_after_stack = make_task (data->pm, "stack");
                 flat_after_median = make_task (data->pm, "flatten");
 
                 flat_interpolate = make_task (data->pm, "interpolate");
 
-                g_object_set (flat_after_stack, "num-items", params->num_flats, NULL);
+                g_object_set (flat_after_stack, "number", params->num_flats, NULL);
                 g_object_set (flat_after_reader, "path", params->flats_after, NULL);
 
                 ufo_task_graph_connect_nodes (read_graph, flat_after_reader, flat_after_stack);