diff --git a/x-pack/plugins/reporting/export_types/csv/server/lib/flatten_hit.js b/x-pack/plugins/reporting/export_types/csv/server/lib/flatten_hit.js
index 4d7a05471e4bd..375b096e32651 100644
--- a/x-pack/plugins/reporting/export_types/csv/server/lib/flatten_hit.js
+++ b/x-pack/plugins/reporting/export_types/csv/server/lib/flatten_hit.js
@@ -6,7 +6,7 @@
 
 import _ from 'lodash';
 
-// FIXME this logic should be re-used with Discover
+// TODO this logic should be re-used with Discover
 export function createFlattenHit(fields, metaFields, conflictedTypesFields) {
   const flattenSource = (flat, obj, keyPrefix) => {
     keyPrefix = keyPrefix ? keyPrefix + '.' : '';
diff --git a/x-pack/plugins/reporting/export_types/csv_from_savedobject/types.d.ts b/x-pack/plugins/reporting/export_types/csv_from_savedobject/index.d.ts
similarity index 100%
rename from x-pack/plugins/reporting/export_types/csv_from_savedobject/types.d.ts
rename to x-pack/plugins/reporting/export_types/csv_from_savedobject/index.d.ts
diff --git a/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts b/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts
index 44b4d2e4874a3..d6166f16dab77 100644
--- a/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts
+++ b/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts
@@ -17,7 +17,7 @@ import {
   SearchPanel,
   TimeRangeParams,
   VisObjectAttributesJSON,
-} from '../../types';
+} from '../../';
 import { createGenerateCsv } from '../lib/generate_csv';
 import { createJobSearch } from './create_job_search';
 
diff --git a/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job_search.ts b/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job_search.ts
index 69ffce57489b1..c98a0f965aa99 100644
--- a/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job_search.ts
+++ b/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job_search.ts
@@ -10,7 +10,7 @@ import {
   SavedSearchObjectAttributes,
   SearchPanel,
   TimeRangeParams,
-} from '../../types';
+} from '../../';
 
 interface SearchPanelData {
   title: string;
diff --git a/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts b/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts
index a0ec8e11f4898..a5929e20847cf 100644
--- a/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts
+++ b/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts
@@ -9,7 +9,7 @@ import { Request } from 'hapi';
 // @ts-ignore
 import { createTaggedLogger } from '../../../../server/lib';
 import { KbnServer, Logger } from '../../../../types';
-import { SearchPanel, VisPanel } from '../../types';
+import { SearchPanel, VisPanel } from '../../';
 import { generateCsvSearch } from './generate_csv_search';
 
 interface FakeRequest {
diff --git a/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts b/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts
index f90f76c10465f..7f3d7c11748b0 100644
--- a/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts
+++ b/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts
@@ -18,7 +18,7 @@ import {
   SearchRequest,
   SearchSource,
   TimeRangeParams,
-} from '../../types';
+} from '../../';
 import { getDataSource } from './get_data_source';
 
 interface SavedSearchGeneratorResult {
@@ -42,7 +42,7 @@ interface GenerateCsvParams {
   formatsMap: FormatsMap;
   metaFields: string[]; // FIXME not sure what this is for
   conflictedTypesFields: string[]; // FIXME not sure what this is for
-  cancellationToken: any; // FIXME not sure how to do anything with this
+  cancellationToken: any;
   settings: {
     separator: string;
     quoteValues: boolean;
@@ -181,7 +181,7 @@ export async function generateCsvSearch(
     formatsMap: new Map(), // there is no field formatting in this API; this is required for generateCsv
     metaFields: [],
     conflictedTypesFields: [],
-    cancellationToken: [],
+    cancellationToken: [], // TODO
     settings: {
       ...uiSettings,
       maxSizeBytes: config.get('xpack.reporting.csv.maxSizeBytes'),
diff --git a/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/lib/get_data_source.ts b/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/lib/get_data_source.ts
index b7e560853e89e..920c55da4f83d 100644
--- a/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/lib/get_data_source.ts
+++ b/x-pack/plugins/reporting/export_types/csv_from_savedobject/server/lib/get_data_source.ts
@@ -9,7 +9,7 @@ import {
   SavedObjectReference,
   SavedSearchObjectAttributesJSON,
   SearchSource,
-} from '../../types';
+} from '../../';
 
 export async function getDataSource(
   savedObjectsClient: any,