diff --git a/x-pack/plugins/reporting/server/browsers/chromium/driver/chromium_driver.ts b/x-pack/plugins/reporting/server/browsers/chromium/driver/chromium_driver.ts
index 5f23bbc390bb80..0a76c7fcfd3b27 100644
--- a/x-pack/plugins/reporting/server/browsers/chromium/driver/chromium_driver.ts
+++ b/x-pack/plugins/reporting/server/browsers/chromium/driver/chromium_driver.ts
@@ -12,7 +12,8 @@ import { parse as parseUrl } from 'url';
 import { getDisallowedOutgoingUrlError } from '../';
 import { LevelLogger } from '../../../lib';
 import { ViewZoomWidthHeight } from '../../../lib/layouts/layout';
-import { ConditionalHeaders, ElementPosition } from '../../../types';
+import { ElementPosition } from '../../../lib/screenshots';
+import { ConditionalHeaders } from '../../../types';
 import { allowRequest, NetworkPolicy } from '../../network_policy';
 
 export interface ChromiumDriverOptions {
diff --git a/x-pack/plugins/reporting/server/core.ts b/x-pack/plugins/reporting/server/core.ts
index 25594e1c0140b7..be32b52f198133 100644
--- a/x-pack/plugins/reporting/server/core.ts
+++ b/x-pack/plugins/reporting/server/core.ts
@@ -17,12 +17,11 @@ import {
 } from 'src/core/server';
 import { LicensingPluginSetup } from '../../licensing/server';
 import { SecurityPluginSetup } from '../../security/server';
-import { ScreenshotsObservableFn } from '../server/types';
 import { ReportingConfig } from './';
 import { HeadlessChromiumDriverFactory } from './browsers/chromium/driver_factory';
-import { screenshotsObservableFactory } from './lib/screenshots';
 import { checkLicense, getExportTypesRegistry } from './lib';
 import { ESQueueInstance } from './lib/create_queue';
+import { screenshotsObservableFactory, ScreenshotsObservableFn } from './lib/screenshots';
 import { ReportingStore } from './lib/store';
 
 export interface ReportingInternalSetup {
diff --git a/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.ts b/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.ts
index 845b9adb38be98..5ab029bfd9f29c 100644
--- a/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.ts
@@ -14,14 +14,14 @@ interface HasEncryptedHeaders {
 // TODO merge functionality with CSV execute job
 export const decryptJobHeaders = async <
   JobParamsType,
-  ScheduledTaskParamsType extends HasEncryptedHeaders
+  TaskPayloadType extends HasEncryptedHeaders
 >({
   encryptionKey,
   job,
   logger,
 }: {
   encryptionKey?: string;
-  job: ScheduledTaskParamsType;
+  job: TaskPayloadType;
   logger: LevelLogger;
 }): Promise<Record<string, string>> => {
   try {
diff --git a/x-pack/plugins/reporting/server/export_types/common/get_conditional_headers.test.ts b/x-pack/plugins/reporting/server/export_types/common/get_conditional_headers.test.ts
index 0372d515c21a86..754bc7bc75cb53 100644
--- a/x-pack/plugins/reporting/server/export_types/common/get_conditional_headers.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/get_conditional_headers.test.ts
@@ -8,8 +8,8 @@ import sinon from 'sinon';
 import { ReportingConfig } from '../../';
 import { ReportingCore } from '../../core';
 import { createMockReportingCore } from '../../test_helpers';
-import { ScheduledTaskParams } from '../../types';
-import { ScheduledTaskParamsPDF } from '../printable_pdf/types';
+import { BasePayload } from '../../types';
+import { TaskPayloadPDF } from '../printable_pdf/types';
 import { getConditionalHeaders, getCustomLogo } from './';
 
 let mockConfig: ReportingConfig;
@@ -37,7 +37,7 @@ describe('conditions', () => {
     };
 
     const conditionalHeaders = await getConditionalHeaders({
-      job: {} as ScheduledTaskParams<any>,
+      job: {} as BasePayload<any>,
       filteredHeaders: permittedHeaders,
       config: mockConfig,
     });
@@ -64,14 +64,14 @@ test('uses basePath from job when creating saved object service', async () => {
     baz: 'quix',
   };
   const conditionalHeaders = await getConditionalHeaders({
-    job: {} as ScheduledTaskParams<any>,
+    job: {} as BasePayload<any>,
     filteredHeaders: permittedHeaders,
     config: mockConfig,
   });
   const jobBasePath = '/sbp/s/marketing';
   await getCustomLogo({
     reporting: mockReportingPlugin,
-    job: { basePath: jobBasePath } as ScheduledTaskParamsPDF,
+    job: { basePath: jobBasePath } as TaskPayloadPDF,
     conditionalHeaders,
     config: mockConfig,
   });
@@ -94,14 +94,14 @@ test(`uses basePath from server if job doesn't have a basePath when creating sav
     baz: 'quix',
   };
   const conditionalHeaders = await getConditionalHeaders({
-    job: {} as ScheduledTaskParams<any>,
+    job: {} as BasePayload<any>,
     filteredHeaders: permittedHeaders,
     config: mockConfig,
   });
 
   await getCustomLogo({
     reporting: mockReportingPlugin,
-    job: {} as ScheduledTaskParamsPDF,
+    job: {} as TaskPayloadPDF,
     conditionalHeaders,
     config: mockConfig,
   });
@@ -139,7 +139,7 @@ describe('config formatting', () => {
     mockConfig = getMockConfig(mockConfigGet);
 
     const conditionalHeaders = await getConditionalHeaders({
-      job: {} as ScheduledTaskParams<any>,
+      job: {} as BasePayload<any>,
       filteredHeaders: {},
       config: mockConfig,
     });
diff --git a/x-pack/plugins/reporting/server/export_types/common/get_conditional_headers.ts b/x-pack/plugins/reporting/server/export_types/common/get_conditional_headers.ts
index 799d0234868327..ce83323914eb8b 100644
--- a/x-pack/plugins/reporting/server/export_types/common/get_conditional_headers.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/get_conditional_headers.ts
@@ -7,13 +7,13 @@
 import { ReportingConfig } from '../../';
 import { ConditionalHeaders } from '../../types';
 
-export const getConditionalHeaders = <ScheduledTaskParamsType>({
+export const getConditionalHeaders = <TaskPayloadType>({
   config,
   job,
   filteredHeaders,
 }: {
   config: ReportingConfig;
-  job: ScheduledTaskParamsType;
+  job: TaskPayloadType;
   filteredHeaders: Record<string, string>;
 }) => {
   const { kbnConfig } = config;
diff --git a/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.test.ts b/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.test.ts
index a3d65a1398a202..8c02fdd69de8bd 100644
--- a/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.test.ts
@@ -6,7 +6,7 @@
 
 import { ReportingCore } from '../../core';
 import { createMockReportingCore } from '../../test_helpers';
-import { ScheduledTaskParamsPDF } from '../printable_pdf/types';
+import { TaskPayloadPDF } from '../printable_pdf/types';
 import { getConditionalHeaders, getCustomLogo } from './';
 
 const mockConfigGet = jest.fn().mockImplementation((key: string) => {
@@ -37,7 +37,7 @@ test(`gets logo from uiSettings`, async () => {
   });
 
   const conditionalHeaders = await getConditionalHeaders({
-    job: {} as ScheduledTaskParamsPDF,
+    job: {} as TaskPayloadPDF,
     filteredHeaders: permittedHeaders,
     config: mockConfig,
   });
@@ -45,7 +45,7 @@ test(`gets logo from uiSettings`, async () => {
   const { logo } = await getCustomLogo({
     reporting: mockReportingPlugin,
     config: mockConfig,
-    job: {} as ScheduledTaskParamsPDF,
+    job: {} as TaskPayloadPDF,
     conditionalHeaders,
   });
 
diff --git a/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.ts b/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.ts
index 547cc45258dae2..ee61d76c8a9330 100644
--- a/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.ts
@@ -7,7 +7,7 @@
 import { ReportingConfig, ReportingCore } from '../../';
 import { UI_SETTINGS_CUSTOM_PDF_LOGO } from '../../../common/constants';
 import { ConditionalHeaders } from '../../types';
-import { ScheduledTaskParamsPDF } from '../printable_pdf/types'; // Logo is PDF only
+import { TaskPayloadPDF } from '../printable_pdf/types'; // Logo is PDF only
 
 export const getCustomLogo = async ({
   reporting,
@@ -17,7 +17,7 @@ export const getCustomLogo = async ({
 }: {
   reporting: ReportingCore;
   config: ReportingConfig;
-  job: ScheduledTaskParamsPDF;
+  job: TaskPayloadPDF;
   conditionalHeaders: ConditionalHeaders;
 }) => {
   const serverBasePath: string = config.kbnConfig.get('server', 'basePath');
diff --git a/x-pack/plugins/reporting/server/export_types/common/get_full_urls.test.ts b/x-pack/plugins/reporting/server/export_types/common/get_full_urls.test.ts
index 73d7c7b03c1283..355536000326e7 100644
--- a/x-pack/plugins/reporting/server/export_types/common/get_full_urls.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/get_full_urls.test.ts
@@ -5,12 +5,12 @@
  */
 
 import { ReportingConfig } from '../../';
-import { ScheduledTaskParamsPNG } from '../png/types';
-import { ScheduledTaskParamsPDF } from '../printable_pdf/types';
+import { TaskPayloadPNG } from '../png/types';
+import { TaskPayloadPDF } from '../printable_pdf/types';
 import { getFullUrls } from './get_full_urls';
 
 interface FullUrlsOpts {
-  job: ScheduledTaskParamsPNG & ScheduledTaskParamsPDF;
+  job: TaskPayloadPNG & TaskPayloadPDF;
   config: ReportingConfig;
 }
 
@@ -35,7 +35,7 @@ beforeEach(() => {
   mockConfig = getMockConfig(mockConfigGet);
 });
 
-const getMockJob = (base: object) => base as ScheduledTaskParamsPNG & ScheduledTaskParamsPDF;
+const getMockJob = (base: object) => base as TaskPayloadPNG & TaskPayloadPDF;
 
 test(`fails if no URL is passed`, async () => {
   const fn = () => getFullUrls({ job: getMockJob({}), config: mockConfig } as FullUrlsOpts);
diff --git a/x-pack/plugins/reporting/server/export_types/common/get_full_urls.ts b/x-pack/plugins/reporting/server/export_types/common/get_full_urls.ts
index d3362fd1906807..d6f472e18bc7b2 100644
--- a/x-pack/plugins/reporting/server/export_types/common/get_full_urls.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/get_full_urls.ts
@@ -11,28 +11,24 @@ import {
   UrlWithStringQuery,
 } from 'url';
 import { ReportingConfig } from '../../';
-import { ScheduledTaskParamsPNG } from '../png/types';
-import { ScheduledTaskParamsPDF } from '../printable_pdf/types';
+import { TaskPayloadPNG } from '../png/types';
+import { TaskPayloadPDF } from '../printable_pdf/types';
 import { getAbsoluteUrlFactory } from './get_absolute_url';
 import { validateUrls } from './validate_urls';
 
-function isPngJob(
-  job: ScheduledTaskParamsPNG | ScheduledTaskParamsPDF
-): job is ScheduledTaskParamsPNG {
-  return (job as ScheduledTaskParamsPNG).relativeUrl !== undefined;
+function isPngJob(job: TaskPayloadPNG | TaskPayloadPDF): job is TaskPayloadPNG {
+  return (job as TaskPayloadPNG).relativeUrl !== undefined;
 }
-function isPdfJob(
-  job: ScheduledTaskParamsPNG | ScheduledTaskParamsPDF
-): job is ScheduledTaskParamsPDF {
-  return (job as ScheduledTaskParamsPDF).relativeUrls !== undefined;
+function isPdfJob(job: TaskPayloadPNG | TaskPayloadPDF): job is TaskPayloadPDF {
+  return (job as TaskPayloadPDF).relativeUrls !== undefined;
 }
 
-export function getFullUrls<ScheduledTaskParamsType>({
+export function getFullUrls<TaskPayloadType>({
   config,
   job,
 }: {
   config: ReportingConfig;
-  job: ScheduledTaskParamsPDF | ScheduledTaskParamsPNG;
+  job: TaskPayloadPDF | TaskPayloadPNG;
 }) {
   const [basePath, protocol, hostname, port] = [
     config.kbnConfig.get('server', 'basePath'),
diff --git a/x-pack/plugins/reporting/server/export_types/common/omit_blacklisted_headers.ts b/x-pack/plugins/reporting/server/export_types/common/omit_blacklisted_headers.ts
index e56ffc737764c8..b2e0ce23aa3a54 100644
--- a/x-pack/plugins/reporting/server/export_types/common/omit_blacklisted_headers.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/omit_blacklisted_headers.ts
@@ -9,11 +9,11 @@ import {
   KBN_SCREENSHOT_HEADER_BLACKLIST_STARTS_WITH_PATTERN,
 } from '../../../common/constants';
 
-export const omitBlacklistedHeaders = <ScheduledTaskParamsType>({
+export const omitBlacklistedHeaders = <TaskPayloadType>({
   job,
   decryptedHeaders,
 }: {
-  job: ScheduledTaskParamsType;
+  job: TaskPayloadType;
   decryptedHeaders: Record<string, string>;
 }) => {
   const filteredHeaders: Record<string, string> = omitBy(
diff --git a/x-pack/plugins/reporting/server/export_types/csv/create_job.ts b/x-pack/plugins/reporting/server/export_types/csv/create_job.ts
index 252968e386b53f..be18bd7fff361d 100644
--- a/x-pack/plugins/reporting/server/export_types/csv/create_job.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv/create_job.ts
@@ -5,16 +5,16 @@
  */
 
 import { cryptoFactory } from '../../lib';
-import { CreateJobFn, ScheduleTaskFnFactory } from '../../types';
+import { CreateJobFn, CreateJobFnFactory } from '../../types';
 import { JobParamsDiscoverCsv } from './types';
 
-export const scheduleTaskFnFactory: ScheduleTaskFnFactory<CreateJobFn<
+export const createJobFnFactory: CreateJobFnFactory<CreateJobFn<
   JobParamsDiscoverCsv
 >> = function createJobFactoryFn(reporting) {
   const config = reporting.getConfig();
   const crypto = cryptoFactory(config.get('encryptionKey'));
 
-  return async function scheduleTask(jobParams, context, request) {
+  return async function createJob(jobParams, context, request) {
     const serializedEncryptedHeaders = await crypto.encrypt(request.headers);
 
     const savedObjectsClient = context.core.savedObjects.client;
diff --git a/x-pack/plugins/reporting/server/export_types/csv/execute_job.test.ts b/x-pack/plugins/reporting/server/export_types/csv/execute_job.test.ts
index 5eeef0f9906dd4..15432d0cbd1474 100644
--- a/x-pack/plugins/reporting/server/export_types/csv/execute_job.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv/execute_job.test.ts
@@ -21,7 +21,7 @@ import { LevelLogger } from '../../lib';
 import { setFieldFormats } from '../../services';
 import { createMockReportingCore } from '../../test_helpers';
 import { runTaskFnFactory } from './execute_job';
-import { ScheduledTaskParamsCSV } from './types';
+import { TaskPayloadCSV } from './types';
 
 const delay = (ms: number) => new Promise((resolve) => setTimeout(() => resolve(), ms));
 
@@ -30,7 +30,7 @@ const getRandomScrollId = () => {
   return puid.generate();
 };
 
-const getScheduledTaskParams = (baseObj: any) => baseObj as ScheduledTaskParamsCSV;
+const getBasePayload = (baseObj: any) => baseObj as TaskPayloadCSV;
 
 describe('CSV Execute Job', function () {
   const encryptionKey = 'testEncryptionKey';
@@ -128,7 +128,7 @@ describe('CSV Execute Job', function () {
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
       await runTask(
         'job456',
-        getScheduledTaskParams({
+        getBasePayload({
           headers: encryptedHeaders,
           fields: [],
           searchRequest: { index: null, body: null },
@@ -146,7 +146,7 @@ describe('CSV Execute Job', function () {
       };
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const job = getScheduledTaskParams({
+      const job = getBasePayload({
         headers: encryptedHeaders,
         fields: [],
         searchRequest: {
@@ -175,7 +175,7 @@ describe('CSV Execute Job', function () {
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
       await runTask(
         'job456',
-        getScheduledTaskParams({
+        getBasePayload({
           headers: encryptedHeaders,
           fields: [],
           searchRequest: { index: null, body: null },
@@ -193,7 +193,7 @@ describe('CSV Execute Job', function () {
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
       await runTask(
         'job456',
-        getScheduledTaskParams({
+        getBasePayload({
           headers: encryptedHeaders,
           fields: [],
           searchRequest: { index: null, body: null },
@@ -227,7 +227,7 @@ describe('CSV Execute Job', function () {
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
       await runTask(
         'job456',
-        getScheduledTaskParams({
+        getBasePayload({
           headers: encryptedHeaders,
           fields: [],
           searchRequest: { index: null, body: null },
@@ -266,7 +266,7 @@ describe('CSV Execute Job', function () {
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
       await runTask(
         'job456',
-        getScheduledTaskParams({
+        getBasePayload({
           headers: encryptedHeaders,
           fields: [],
           searchRequest: { index: null, body: null },
@@ -296,7 +296,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: undefined,
@@ -323,7 +323,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
@@ -348,7 +348,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['=SUM(A1:A2)', 'two'],
         conflictedTypesFields: [],
@@ -374,7 +374,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
@@ -400,7 +400,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['=SUM(A1:A2)', 'two'],
         conflictedTypesFields: [],
@@ -426,7 +426,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
@@ -453,7 +453,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
@@ -474,7 +474,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
@@ -497,7 +497,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
@@ -518,7 +518,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
@@ -534,7 +534,7 @@ describe('CSV Execute Job', function () {
     it('should reject Promise if search call errors out', async function () {
       callAsCurrentUserStub.rejects(new Error());
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: [],
         searchRequest: { index: null, body: null },
@@ -553,7 +553,7 @@ describe('CSV Execute Job', function () {
       });
       callAsCurrentUserStub.onSecondCall().rejects(new Error());
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: [],
         searchRequest: { index: null, body: null },
@@ -574,7 +574,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: [],
         searchRequest: { index: null, body: null },
@@ -593,7 +593,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: [],
         searchRequest: { index: null, body: null },
@@ -619,7 +619,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: [],
         searchRequest: { index: null, body: null },
@@ -645,7 +645,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: [],
         searchRequest: { index: null, body: null },
@@ -681,7 +681,7 @@ describe('CSV Execute Job', function () {
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
       runTask(
         'job345',
-        getScheduledTaskParams({
+        getBasePayload({
           headers: encryptedHeaders,
           fields: [],
           searchRequest: { index: null, body: null },
@@ -700,7 +700,7 @@ describe('CSV Execute Job', function () {
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
       runTask(
         'job345',
-        getScheduledTaskParams({
+        getBasePayload({
           headers: encryptedHeaders,
           fields: [],
           searchRequest: { index: null, body: null },
@@ -718,7 +718,7 @@ describe('CSV Execute Job', function () {
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
       runTask(
         'job345',
-        getScheduledTaskParams({
+        getBasePayload({
           headers: encryptedHeaders,
           fields: [],
           searchRequest: { index: null, body: null },
@@ -738,7 +738,7 @@ describe('CSV Execute Job', function () {
   describe('csv content', function () {
     it('should write column headers to output, even if there are no results', async function () {
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         searchRequest: { index: null, body: null },
@@ -750,7 +750,7 @@ describe('CSV Execute Job', function () {
     it('should use custom uiSettings csv:separator for header', async function () {
       mockUiSettingsClient.get.withArgs(CSV_SEPARATOR_SETTING).returns(';');
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         searchRequest: { index: null, body: null },
@@ -762,7 +762,7 @@ describe('CSV Execute Job', function () {
     it('should escape column headers if uiSettings csv:quoteValues is true', async function () {
       mockUiSettingsClient.get.withArgs(CSV_QUOTE_VALUES_SETTING).returns(true);
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one and a half', 'two', 'three-and-four', 'five & six'],
         searchRequest: { index: null, body: null },
@@ -774,7 +774,7 @@ describe('CSV Execute Job', function () {
     it(`shouldn't escape column headers if uiSettings csv:quoteValues is false`, async function () {
       mockUiSettingsClient.get.withArgs(CSV_QUOTE_VALUES_SETTING).returns(false);
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one and a half', 'two', 'three-and-four', 'five & six'],
         searchRequest: { index: null, body: null },
@@ -792,7 +792,7 @@ describe('CSV Execute Job', function () {
         _scroll_id: 'scrollId',
       });
 
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         searchRequest: { index: null, body: null },
@@ -813,7 +813,7 @@ describe('CSV Execute Job', function () {
         _scroll_id: 'scrollId',
       });
 
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
@@ -841,7 +841,7 @@ describe('CSV Execute Job', function () {
         _scroll_id: 'scrollId',
       });
 
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
@@ -864,7 +864,7 @@ describe('CSV Execute Job', function () {
         _scroll_id: 'scrollId',
       });
 
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
@@ -900,7 +900,7 @@ describe('CSV Execute Job', function () {
         configGetStub.withArgs('csv', 'maxSizeBytes').returns(1);
 
         const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-        const jobParams = getScheduledTaskParams({
+        const jobParams = getBasePayload({
           headers: encryptedHeaders,
           fields: ['one', 'two'],
           searchRequest: { index: null, body: null },
@@ -930,7 +930,7 @@ describe('CSV Execute Job', function () {
         configGetStub.withArgs('csv', 'maxSizeBytes').returns(9);
 
         const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-        const jobParams = getScheduledTaskParams({
+        const jobParams = getBasePayload({
           headers: encryptedHeaders,
           fields: ['one', 'two'],
           searchRequest: { index: null, body: null },
@@ -967,7 +967,7 @@ describe('CSV Execute Job', function () {
         });
 
         const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-        const jobParams = getScheduledTaskParams({
+        const jobParams = getBasePayload({
           headers: encryptedHeaders,
           fields: ['one', 'two'],
           conflictedTypesFields: [],
@@ -1007,7 +1007,7 @@ describe('CSV Execute Job', function () {
         });
 
         const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-        const jobParams = getScheduledTaskParams({
+        const jobParams = getBasePayload({
           headers: encryptedHeaders,
           fields: ['one', 'two'],
           conflictedTypesFields: [],
@@ -1044,7 +1044,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
@@ -1070,7 +1070,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
@@ -1096,7 +1096,7 @@ describe('CSV Execute Job', function () {
       });
 
       const runTask = runTaskFnFactory(mockReportingCore, mockLogger);
-      const jobParams = getScheduledTaskParams({
+      const jobParams = getBasePayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
diff --git a/x-pack/plugins/reporting/server/export_types/csv/execute_job.ts b/x-pack/plugins/reporting/server/export_types/csv/execute_job.ts
index b56a08b86b0cd2..b308935a29e920 100644
--- a/x-pack/plugins/reporting/server/export_types/csv/execute_job.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv/execute_job.ts
@@ -10,9 +10,9 @@ import Hapi from 'hapi';
 import { KibanaRequest } from '../../../../../../src/core/server';
 import { CONTENT_TYPE_CSV, CSV_JOB_TYPE } from '../../../common/constants';
 import { cryptoFactory, LevelLogger } from '../../lib';
-import { WorkerExecuteFn, RunTaskFnFactory } from '../../types';
-import { ScheduledTaskParamsCSV } from './types';
+import { RunTaskFn, RunTaskFnFactory } from '../../types';
 import { createGenerateCsv } from './generate_csv';
+import { TaskPayloadCSV } from './types';
 
 const getRequest = async (headers: string | undefined, crypto: Crypto, logger: LevelLogger) => {
   const decryptHeaders = async () => {
@@ -55,8 +55,8 @@ const getRequest = async (headers: string | undefined, crypto: Crypto, logger: L
   } as Hapi.Request);
 };
 
-export const runTaskFnFactory: RunTaskFnFactory<WorkerExecuteFn<
-  ScheduledTaskParamsCSV
+export const runTaskFnFactory: RunTaskFnFactory<RunTaskFn<
+  TaskPayloadCSV
 >> = function executeJobFactoryFn(reporting, parentLogger) {
   const config = reporting.getConfig();
   const crypto = cryptoFactory(config.get('encryptionKey'));
diff --git a/x-pack/plugins/reporting/server/export_types/csv/index.ts b/x-pack/plugins/reporting/server/export_types/csv/index.ts
index 4bca42e0661e5c..b54844cdf17427 100644
--- a/x-pack/plugins/reporting/server/export_types/csv/index.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv/index.ts
@@ -13,22 +13,22 @@ import {
   LICENSE_TYPE_TRIAL,
 } from '../../../common/constants';
 import { CSV_JOB_TYPE as jobType } from '../../../constants';
-import { CreateJobFn, WorkerExecuteFn, ExportTypeDefinition } from '../../types';
-import { scheduleTaskFnFactory } from './create_job';
+import { CreateJobFn, ExportTypeDefinition, RunTaskFn } from '../../types';
+import { createJobFnFactory } from './create_job';
 import { runTaskFnFactory } from './execute_job';
 import { metadata } from './metadata';
-import { JobParamsDiscoverCsv, ScheduledTaskParamsCSV } from './types';
+import { JobParamsDiscoverCsv, TaskPayloadCSV } from './types';
 
 export const getExportType = (): ExportTypeDefinition<
   JobParamsDiscoverCsv,
   CreateJobFn<JobParamsDiscoverCsv>,
-  ScheduledTaskParamsCSV,
-  WorkerExecuteFn<ScheduledTaskParamsCSV>
+  TaskPayloadCSV,
+  RunTaskFn<TaskPayloadCSV>
 > => ({
   ...metadata,
   jobType,
   jobContentExtension: 'csv',
-  scheduleTaskFnFactory,
+  createJobFnFactory,
   runTaskFnFactory,
   validLicenses: [
     LICENSE_TYPE_TRIAL,
diff --git a/x-pack/plugins/reporting/server/export_types/csv/types.d.ts b/x-pack/plugins/reporting/server/export_types/csv/types.d.ts
index e0d09d04a3d3a4..f420d8b033170d 100644
--- a/x-pack/plugins/reporting/server/export_types/csv/types.d.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv/types.d.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CreateJobBaseParams, ScheduledTaskParams } from '../../types';
+import { BaseParams, BasePayload } from '../../types';
 
 export type RawValue = string | object | null | undefined;
 
@@ -28,7 +28,7 @@ export interface IndexPatternSavedObject {
   };
 }
 
-export interface JobParamsDiscoverCsv extends CreateJobBaseParams {
+export interface JobParamsDiscoverCsv extends BaseParams {
   indexPatternId: string;
   title: string;
   searchRequest: SearchRequest;
@@ -37,7 +37,7 @@ export interface JobParamsDiscoverCsv extends CreateJobBaseParams {
   conflictedTypesFields: string[];
 }
 
-export interface ScheduledTaskParamsCSV extends ScheduledTaskParams<JobParamsDiscoverCsv> {
+export interface TaskPayloadCSV extends BasePayload<JobParamsDiscoverCsv> {
   basePath: string;
   searchRequest: any;
   fields: any;
diff --git a/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/create_job.ts b/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/create_job.ts
index 9acfc6d8c608d1..1746792981a21f 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/create_job.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/create_job.ts
@@ -9,7 +9,7 @@ import { get } from 'lodash';
 import { KibanaRequest, RequestHandlerContext } from 'src/core/server';
 import { CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../../common/constants';
 import { cryptoFactory } from '../../lib';
-import { ScheduleTaskFnFactory, TimeRangeParams } from '../../types';
+import { CreateJobFnFactory, TimeRangeParams } from '../../types';
 import {
   JobParamsPanelCsv,
   SavedObject,
@@ -37,7 +37,7 @@ interface VisData {
   panel: SearchPanel;
 }
 
-export const scheduleTaskFnFactory: ScheduleTaskFnFactory<ImmediateCreateJobFn> = function createJobFactoryFn(
+export const createJobFnFactory: CreateJobFnFactory<ImmediateCreateJobFn> = function createJobFactoryFn(
   reporting,
   parentLogger
 ) {
@@ -45,7 +45,7 @@ export const scheduleTaskFnFactory: ScheduleTaskFnFactory<ImmediateCreateJobFn>
   const crypto = cryptoFactory(config.get('encryptionKey'));
   const logger = parentLogger.clone([CSV_FROM_SAVEDOBJECT_JOB_TYPE, 'create-job']);
 
-  return async function scheduleTask(jobParams, headers, context, req) {
+  return async function createJob(jobParams, headers, context, req) {
     const { savedObjectType, savedObjectId } = jobParams;
     const serializedEncryptedHeaders = await crypto.encrypt(headers);
 
diff --git a/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/execute_job.ts b/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/execute_job.ts
index ec7e0a21f0498a..3a5deda176b8c1 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/execute_job.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/execute_job.ts
@@ -7,16 +7,16 @@
 import { KibanaRequest, RequestHandlerContext } from 'src/core/server';
 import { CancellationToken } from '../../../common';
 import { CONTENT_TYPE_CSV, CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../../common/constants';
-import { RunTaskFnFactory, ScheduledTaskParams, TaskRunResult } from '../../types';
+import { BasePayload, RunTaskFnFactory, TaskRunResult } from '../../types';
 import { createGenerateCsv } from '../csv/generate_csv';
-import { JobParamsPanelCsv, SearchPanel } from './types';
 import { getGenerateCsvParams } from './lib/get_csv_job';
+import { JobParamsPanelCsv, SearchPanel } from './types';
 
 /*
  * The run function receives the full request which provides the un-encrypted
  * headers, so encrypted headers are not part of these kind of job params
  */
-type ImmediateJobParams = Omit<ScheduledTaskParams<JobParamsPanelCsv>, 'headers'>;
+type ImmediateJobParams = Omit<BasePayload<JobParamsPanelCsv>, 'headers'>;
 
 /*
  * ImmediateExecuteFn receives the job doc payload because the payload was
diff --git a/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/index.ts b/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/index.ts
index 7467f415299fa1..4b4cfb3f062bf2 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/index.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/index.ts
@@ -14,16 +14,16 @@ import {
 } from '../../../common/constants';
 import { CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../../constants';
 import { ExportTypeDefinition } from '../../types';
-import { metadata } from './metadata';
-import { ImmediateCreateJobFn, scheduleTaskFnFactory } from './create_job';
+import { createJobFnFactory, ImmediateCreateJobFn } from './create_job';
 import { ImmediateExecuteFn, runTaskFnFactory } from './execute_job';
+import { metadata } from './metadata';
 import { JobParamsPanelCsv } from './types';
 
 /*
  * These functions are exported to share with the API route handler that
  * generates csv from saved object immediately on request.
  */
-export { scheduleTaskFnFactory } from './create_job';
+export { createJobFnFactory } from './create_job';
 export { runTaskFnFactory } from './execute_job';
 
 export const getExportType = (): ExportTypeDefinition<
@@ -35,7 +35,7 @@ export const getExportType = (): ExportTypeDefinition<
   ...metadata,
   jobType: CSV_FROM_SAVEDOBJECT_JOB_TYPE,
   jobContentExtension: 'csv',
-  scheduleTaskFnFactory,
+  createJobFnFactory,
   runTaskFnFactory,
   validLicenses: [
     LICENSE_TYPE_TRIAL,
diff --git a/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/types.d.ts b/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/types.d.ts
index 0d19a24114f06d..9c45d23b13a371 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/types.d.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/types.d.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { JobParamPostPayload, ScheduledTaskParams, TimeRangeParams } from '../../types';
+import { JobParamPostPayload, TimeRangeParams } from '../../types';
 
 export interface FakeRequest {
   headers: Record<string, unknown>;
@@ -14,11 +14,20 @@ export interface JobParamsPostPayloadPanelCsv extends JobParamPostPayload {
   state?: any;
 }
 
+export interface SearchPanel {
+  indexPatternSavedObjectId: string;
+  attributes: SavedSearchObjectAttributes;
+  timerange: TimeRangeParams;
+}
+
+export interface JobPayloadPanelCsv extends JobParamsPanelCsv {
+  panel: SearchPanel;
+}
+
 export interface JobParamsPanelCsv {
   savedObjectType: string;
   savedObjectId: string;
   isImmediate: boolean;
-  panel?: SearchPanel;
   post?: JobParamsPostPayloadPanelCsv;
   visType?: string;
 }
@@ -102,12 +111,6 @@ export interface VisPanel {
   timerange: TimeRangeParams;
 }
 
-export interface SearchPanel {
-  indexPatternSavedObjectId: string;
-  attributes: SavedSearchObjectAttributes;
-  timerange: TimeRangeParams;
-}
-
 export interface DocValueFields {
   field: string;
   format: string;
diff --git a/x-pack/plugins/reporting/server/export_types/png/create_job/index.ts b/x-pack/plugins/reporting/server/export_types/png/create_job/index.ts
index 2252177e980850..173a67ad18edf7 100644
--- a/x-pack/plugins/reporting/server/export_types/png/create_job/index.ts
+++ b/x-pack/plugins/reporting/server/export_types/png/create_job/index.ts
@@ -5,17 +5,17 @@
  */
 
 import { cryptoFactory } from '../../../lib';
-import { CreateJobFn, ScheduleTaskFnFactory } from '../../../types';
+import { CreateJobFn, CreateJobFnFactory } from '../../../types';
 import { validateUrls } from '../../common';
 import { JobParamsPNG } from '../types';
 
-export const scheduleTaskFnFactory: ScheduleTaskFnFactory<CreateJobFn<
+export const createJobFnFactory: CreateJobFnFactory<CreateJobFn<
   JobParamsPNG
 >> = function createJobFactoryFn(reporting) {
   const config = reporting.getConfig();
   const crypto = cryptoFactory(config.get('encryptionKey'));
 
-  return async function scheduleTask(
+  return async function createJob(
     { objectType, title, relativeUrl, browserTimezone, layout },
     context,
     req
diff --git a/x-pack/plugins/reporting/server/export_types/png/execute_job/index.test.ts b/x-pack/plugins/reporting/server/export_types/png/execute_job/index.test.ts
index a0bd2d392187a6..8a3f514ec7aeaf 100644
--- a/x-pack/plugins/reporting/server/export_types/png/execute_job/index.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/png/execute_job/index.test.ts
@@ -9,8 +9,8 @@ import { ReportingCore } from '../../../';
 import { CancellationToken } from '../../../../common';
 import { cryptoFactory, LevelLogger } from '../../../lib';
 import { createMockReportingCore } from '../../../test_helpers';
-import { ScheduledTaskParamsPNG } from '../types';
 import { generatePngObservableFactory } from '../lib/generate_png';
+import { TaskPayloadPNG } from '../types';
 import { runTaskFnFactory } from './';
 
 jest.mock('../lib/generate_png', () => ({ generatePngObservableFactory: jest.fn() }));
@@ -36,7 +36,7 @@ const encryptHeaders = async (headers: Record<string, string>) => {
   return await crypto.encrypt(headers);
 };
 
-const getScheduledTaskParams = (baseObj: any) => baseObj as ScheduledTaskParamsPNG;
+const getBasePayload = (baseObj: any) => baseObj as TaskPayloadPNG;
 
 beforeEach(async () => {
   const kbnConfig = {
@@ -85,7 +85,7 @@ test(`passes browserTimezone to generatePng`, async () => {
   const browserTimezone = 'UTC';
   await runTask(
     'pngJobId',
-    getScheduledTaskParams({
+    getBasePayload({
       relativeUrl: '/app/kibana#/something',
       browserTimezone,
       headers: encryptedHeaders,
@@ -133,7 +133,7 @@ test(`returns content_type of application/png`, async () => {
 
   const { content_type: contentType } = await runTask(
     'pngJobId',
-    getScheduledTaskParams({ relativeUrl: '/app/kibana#/something', headers: encryptedHeaders }),
+    getBasePayload({ relativeUrl: '/app/kibana#/something', headers: encryptedHeaders }),
     cancellationToken
   );
   expect(contentType).toBe('image/png');
@@ -148,7 +148,7 @@ test(`returns content of generatePng getBuffer base64 encoded`, async () => {
   const encryptedHeaders = await encryptHeaders({});
   const { content } = await runTask(
     'pngJobId',
-    getScheduledTaskParams({ relativeUrl: '/app/kibana#/something', headers: encryptedHeaders }),
+    getBasePayload({ relativeUrl: '/app/kibana#/something', headers: encryptedHeaders }),
     cancellationToken
   );
 
diff --git a/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts b/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts
index 35cd4139df413f..96b896b9389622 100644
--- a/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts
+++ b/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts
@@ -8,7 +8,7 @@ import apm from 'elastic-apm-node';
 import * as Rx from 'rxjs';
 import { catchError, map, mergeMap, takeUntil } from 'rxjs/operators';
 import { PNG_JOB_TYPE } from '../../../../common/constants';
-import { WorkerExecuteFn, RunTaskFnFactory, TaskRunResult } from '../../..//types';
+import { RunTaskFn, RunTaskFnFactory, TaskRunResult } from '../../..//types';
 import {
   decryptJobHeaders,
   getConditionalHeaders,
@@ -16,9 +16,9 @@ import {
   omitBlacklistedHeaders,
 } from '../../common';
 import { generatePngObservableFactory } from '../lib/generate_png';
-import { ScheduledTaskParamsPNG } from '../types';
+import { TaskPayloadPNG } from '../types';
 
-type QueuedPngExecutorFactory = RunTaskFnFactory<WorkerExecuteFn<ScheduledTaskParamsPNG>>;
+type QueuedPngExecutorFactory = RunTaskFnFactory<RunTaskFn<TaskPayloadPNG>>;
 
 export const runTaskFnFactory: QueuedPngExecutorFactory = function executeJobFactoryFn(
   reporting,
diff --git a/x-pack/plugins/reporting/server/export_types/png/index.ts b/x-pack/plugins/reporting/server/export_types/png/index.ts
index c966dedb6b076d..1cc6836572b7b3 100644
--- a/x-pack/plugins/reporting/server/export_types/png/index.ts
+++ b/x-pack/plugins/reporting/server/export_types/png/index.ts
@@ -12,23 +12,23 @@ import {
   LICENSE_TYPE_TRIAL,
   PNG_JOB_TYPE as jobType,
 } from '../../../common/constants';
-import { CreateJobFn, WorkerExecuteFn, ExportTypeDefinition } from '../../types';
-import { scheduleTaskFnFactory } from './create_job';
+import { CreateJobFn, ExportTypeDefinition, RunTaskFn } from '../../types';
+import { createJobFnFactory } from './create_job';
 import { runTaskFnFactory } from './execute_job';
 import { metadata } from './metadata';
-import { JobParamsPNG, ScheduledTaskParamsPNG } from './types';
+import { JobParamsPNG, TaskPayloadPNG } from './types';
 
 export const getExportType = (): ExportTypeDefinition<
   JobParamsPNG,
   CreateJobFn<JobParamsPNG>,
-  ScheduledTaskParamsPNG,
-  WorkerExecuteFn<ScheduledTaskParamsPNG>
+  TaskPayloadPNG,
+  RunTaskFn<TaskPayloadPNG>
 > => ({
   ...metadata,
   jobType,
   jobContentEncoding: 'base64',
   jobContentExtension: 'PNG',
-  scheduleTaskFnFactory,
+  createJobFnFactory,
   runTaskFnFactory,
   validLicenses: [
     LICENSE_TYPE_TRIAL,
diff --git a/x-pack/plugins/reporting/server/export_types/png/lib/generate_png.ts b/x-pack/plugins/reporting/server/export_types/png/lib/generate_png.ts
index 5969b5b8abc002..c3d5b2cc600513 100644
--- a/x-pack/plugins/reporting/server/export_types/png/lib/generate_png.ts
+++ b/x-pack/plugins/reporting/server/export_types/png/lib/generate_png.ts
@@ -10,7 +10,8 @@ import { map } from 'rxjs/operators';
 import { ReportingCore } from '../../../';
 import { LevelLogger } from '../../../lib';
 import { LayoutParams, PreserveLayout } from '../../../lib/layouts';
-import { ConditionalHeaders, ScreenshotResults } from '../../../types';
+import { ScreenshotResults } from '../../../lib/screenshots';
+import { ConditionalHeaders } from '../../../types';
 
 export async function generatePngObservableFactory(reporting: ReportingCore) {
   const getScreenshots = await reporting.getScreenshotsObservable();
diff --git a/x-pack/plugins/reporting/server/export_types/png/types.d.ts b/x-pack/plugins/reporting/server/export_types/png/types.d.ts
index 1ddee8419df309..a747f53861a999 100644
--- a/x-pack/plugins/reporting/server/export_types/png/types.d.ts
+++ b/x-pack/plugins/reporting/server/export_types/png/types.d.ts
@@ -4,17 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CreateJobBaseParams, ScheduledTaskParams } from '../../../server/types';
-import { LayoutInstance, LayoutParams } from '../../lib/layouts';
+import { BaseParams, BasePayload } from '../../../server/types';
+import { LayoutParams } from '../../lib/layouts';
 
 // Job params: structure of incoming user request data
-export interface JobParamsPNG extends CreateJobBaseParams {
+export interface JobParamsPNG extends BaseParams {
   title: string;
   relativeUrl: string;
 }
 
 // Job payload: structure of stored job data provided by create_job
-export interface ScheduledTaskParamsPNG extends ScheduledTaskParams<JobParamsPNG> {
+export interface TaskPayloadPNG extends BasePayload<JobParamsPNG> {
   basePath?: string;
   browserTimezone: string;
   forceNow?: string;
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/create_job/index.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/create_job/index.ts
index 5de089a13bfa44..96e634337e6a94 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/create_job/index.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/create_job/index.ts
@@ -5,17 +5,17 @@
  */
 
 import { cryptoFactory } from '../../../lib';
-import { CreateJobFn, ScheduleTaskFnFactory } from '../../../types';
+import { CreateJobFn, CreateJobFnFactory } from '../../../types';
 import { validateUrls } from '../../common';
 import { JobParamsPDF } from '../types';
 
-export const scheduleTaskFnFactory: ScheduleTaskFnFactory<CreateJobFn<
+export const createJobFnFactory: CreateJobFnFactory<CreateJobFn<
   JobParamsPDF
 >> = function createJobFactoryFn(reporting) {
   const config = reporting.getConfig();
   const crypto = cryptoFactory(config.get('encryptionKey'));
 
-  return async function scheduleTaskFn(
+  return async function createJob(
     { title, relativeUrls, browserTimezone, layout, objectType },
     context,
     req
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.test.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.test.ts
index 443db1b57fe484..fdc51dc1c9c878 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.test.ts
@@ -12,7 +12,7 @@ import { CancellationToken } from '../../../../common';
 import { cryptoFactory, LevelLogger } from '../../../lib';
 import { createMockReportingCore } from '../../../test_helpers';
 import { generatePdfObservableFactory } from '../lib/generate_pdf';
-import { ScheduledTaskParamsPDF } from '../types';
+import { TaskPayloadPDF } from '../types';
 import { runTaskFnFactory } from './';
 
 let mockReporting: ReportingCore;
@@ -36,7 +36,7 @@ const encryptHeaders = async (headers: Record<string, string>) => {
   return await crypto.encrypt(headers);
 };
 
-const getScheduledTaskParams = (baseObj: any) => baseObj as ScheduledTaskParamsPDF;
+const getBasePayload = (baseObj: any) => baseObj as TaskPayloadPDF;
 
 beforeEach(async () => {
   const kbnConfig = {
@@ -83,7 +83,7 @@ test(`passes browserTimezone to generatePdf`, async () => {
   const browserTimezone = 'UTC';
   await runTask(
     'pdfJobId',
-    getScheduledTaskParams({
+    getBasePayload({
       title: 'PDF Params Timezone Test',
       relativeUrl: '/app/kibana#/something',
       browserTimezone,
@@ -106,7 +106,7 @@ test(`returns content_type of application/pdf`, async () => {
 
   const { content_type: contentType } = await runTask(
     'pdfJobId',
-    getScheduledTaskParams({ relativeUrls: [], headers: encryptedHeaders }),
+    getBasePayload({ relativeUrls: [], headers: encryptedHeaders }),
     cancellationToken
   );
   expect(contentType).toBe('application/pdf');
@@ -121,7 +121,7 @@ test(`returns content of generatePdf getBuffer base64 encoded`, async () => {
   const encryptedHeaders = await encryptHeaders({});
   const { content } = await runTask(
     'pdfJobId',
-    getScheduledTaskParams({ relativeUrls: [], headers: encryptedHeaders }),
+    getBasePayload({ relativeUrls: [], headers: encryptedHeaders }),
     cancellationToken
   );
 
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts
index 5ace1c987adb5a..78808400c9c9ad 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts
@@ -8,7 +8,7 @@ import apm from 'elastic-apm-node';
 import * as Rx from 'rxjs';
 import { catchError, map, mergeMap, takeUntil } from 'rxjs/operators';
 import { PDF_JOB_TYPE } from '../../../../common/constants';
-import { WorkerExecuteFn, RunTaskFnFactory, TaskRunResult } from '../../../types';
+import { RunTaskFn, RunTaskFnFactory, TaskRunResult } from '../../../types';
 import {
   decryptJobHeaders,
   getConditionalHeaders,
@@ -17,9 +17,9 @@ import {
   omitBlacklistedHeaders,
 } from '../../common';
 import { generatePdfObservableFactory } from '../lib/generate_pdf';
-import { ScheduledTaskParamsPDF } from '../types';
+import { TaskPayloadPDF } from '../types';
 
-type QueuedPdfExecutorFactory = RunTaskFnFactory<WorkerExecuteFn<ScheduledTaskParamsPDF>>;
+type QueuedPdfExecutorFactory = RunTaskFnFactory<RunTaskFn<TaskPayloadPDF>>;
 
 export const runTaskFnFactory: QueuedPdfExecutorFactory = function executeJobFactoryFn(
   reporting,
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/index.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/index.ts
index 7f21d36c4b72c4..cf3ec9cdc8c2d0 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/index.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/index.ts
@@ -12,23 +12,23 @@ import {
   LICENSE_TYPE_TRIAL,
   PDF_JOB_TYPE as jobType,
 } from '../../../common/constants';
-import { CreateJobFn, WorkerExecuteFn, ExportTypeDefinition } from '../../types';
-import { scheduleTaskFnFactory } from './create_job';
+import { CreateJobFn, ExportTypeDefinition, RunTaskFn } from '../../types';
+import { createJobFnFactory } from './create_job';
 import { runTaskFnFactory } from './execute_job';
 import { metadata } from './metadata';
-import { JobParamsPDF, ScheduledTaskParamsPDF } from './types';
+import { JobParamsPDF, TaskPayloadPDF } from './types';
 
 export const getExportType = (): ExportTypeDefinition<
   JobParamsPDF,
   CreateJobFn<JobParamsPDF>,
-  ScheduledTaskParamsPDF,
-  WorkerExecuteFn<ScheduledTaskParamsPDF>
+  TaskPayloadPDF,
+  RunTaskFn<TaskPayloadPDF>
 > => ({
   ...metadata,
   jobType,
   jobContentEncoding: 'base64',
   jobContentExtension: 'pdf',
-  scheduleTaskFnFactory,
+  createJobFnFactory,
   runTaskFnFactory,
   validLicenses: [
     LICENSE_TYPE_TRIAL,
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts
index 2e0292e1f9ab58..17624c1bedb57a 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts
@@ -10,7 +10,8 @@ import { mergeMap } from 'rxjs/operators';
 import { ReportingCore } from '../../../';
 import { LevelLogger } from '../../../lib';
 import { createLayout, LayoutInstance, LayoutParams } from '../../../lib/layouts';
-import { ConditionalHeaders, ScreenshotResults } from '../../../types';
+import { ScreenshotResults } from '../../../lib/screenshots';
+import { ConditionalHeaders } from '../../../types';
 // @ts-ignore untyped module
 import { pdf } from './pdf';
 import { getTracker } from './tracker';
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/types.d.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/types.d.ts
index 7830f87780c2eb..3020cbb5f28b00 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/types.d.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/types.d.ts
@@ -4,18 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CreateJobBaseParams, ScheduledTaskParams } from '../../../server/types';
+import { BaseParams, BasePayload } from '../../../server/types';
 import { LayoutInstance, LayoutParams } from '../../lib/layouts';
 
 // Job params: structure of incoming user request data, after being parsed from RISON
-export interface JobParamsPDF extends CreateJobBaseParams {
+export interface JobParamsPDF extends BaseParams {
   title: string;
   relativeUrls: string[];
   layout: LayoutInstance;
 }
 
 // Job payload: structure of stored job data provided by create_job
-export interface ScheduledTaskParamsPDF extends ScheduledTaskParams<JobParamsPDF> {
+export interface TaskPayloadPDF extends BasePayload<JobParamsPDF> {
   basePath?: string;
   browserTimezone: string;
   forceNow?: string;
diff --git a/x-pack/plugins/reporting/server/lib/create_worker.ts b/x-pack/plugins/reporting/server/lib/create_worker.ts
index 5b0f1ddb2f1579..dd5c5604552743 100644
--- a/x-pack/plugins/reporting/server/lib/create_worker.ts
+++ b/x-pack/plugins/reporting/server/lib/create_worker.ts
@@ -8,7 +8,7 @@ import { CancellationToken } from '../../common';
 import { PLUGIN_ID } from '../../common/constants';
 import { ReportingCore } from '../../server';
 import { LevelLogger } from '../../server/lib';
-import { ExportTypeDefinition, JobSource, WorkerExecuteFn } from '../../server/types';
+import { ExportTypeDefinition, JobSource, RunTaskFn } from '../../server/types';
 import { ESQueueInstance } from './create_queue';
 // @ts-ignore untyped dependency
 import { events as esqueueEvents } from './esqueue';
@@ -22,18 +22,18 @@ export function createWorkerFactory<JobParamsType>(reporting: ReportingCore, log
   // Once more document types are added, this will need to be passed in
   return async function createWorker(queue: ESQueueInstance) {
     // export type / execute job map
-    const jobExecutors: Map<string, WorkerExecuteFn<unknown>> = new Map();
+    const jobExecutors: Map<string, RunTaskFn<unknown>> = new Map();
 
     for (const exportType of reporting.getExportTypesRegistry().getAll() as Array<
-      ExportTypeDefinition<JobParamsType, unknown, unknown, WorkerExecuteFn<unknown>>
+      ExportTypeDefinition<JobParamsType, unknown, unknown, RunTaskFn<unknown>>
     >) {
       const jobExecutor = exportType.runTaskFnFactory(reporting, logger);
       jobExecutors.set(exportType.jobType, jobExecutor);
     }
 
-    const workerFn = <ScheduledTaskParamsType>(
-      jobSource: JobSource<ScheduledTaskParamsType>,
-      jobParams: ScheduledTaskParamsType,
+    const workerFn = <TaskPayloadType>(
+      jobSource: JobSource<TaskPayloadType>,
+      jobParams: TaskPayloadType,
       cancellationToken: CancellationToken
     ) => {
       const {
diff --git a/x-pack/plugins/reporting/server/lib/enqueue_job.ts b/x-pack/plugins/reporting/server/lib/enqueue_job.ts
index 3e3aef92c55a3c..5acc6e38dddf9d 100644
--- a/x-pack/plugins/reporting/server/lib/enqueue_job.ts
+++ b/x-pack/plugins/reporting/server/lib/enqueue_job.ts
@@ -6,13 +6,13 @@
 
 import { KibanaRequest, RequestHandlerContext } from 'src/core/server';
 import { ReportingCore } from '../';
-import { CreateJobBaseParams, CreateJobFn, ReportingUser } from '../types';
+import { BaseParams, CreateJobFn, ReportingUser } from '../types';
 import { LevelLogger } from './';
 import { Report } from './store';
 
 export type EnqueueJobFn = (
   exportTypeId: string,
-  jobParams: CreateJobBaseParams,
+  jobParams: BaseParams,
   user: ReportingUser,
   context: RequestHandlerContext,
   request: KibanaRequest
@@ -26,12 +26,12 @@ export function enqueueJobFactory(
 
   return async function enqueueJob(
     exportTypeId: string,
-    jobParams: CreateJobBaseParams,
+    jobParams: BaseParams,
     user: ReportingUser,
     context: RequestHandlerContext,
     request: KibanaRequest
   ) {
-    type ScheduleTaskFnType = CreateJobFn<CreateJobBaseParams>;
+    type CreateJobFnType = CreateJobFn<BaseParams>;
 
     const exportType = reporting.getExportTypesRegistry().getById(exportTypeId);
 
@@ -39,13 +39,13 @@ export function enqueueJobFactory(
       throw new Error(`Export type ${exportTypeId} does not exist in the registry!`);
     }
 
-    const [scheduleTask, { store }] = await Promise.all([
-      exportType.scheduleTaskFnFactory(reporting, logger) as ScheduleTaskFnType,
+    const [createJob, { store }] = await Promise.all([
+      exportType.createJobFnFactory(reporting, logger) as CreateJobFnType,
       reporting.getPluginStartDeps(),
     ]);
 
     // add encrytped headers
-    const payload = await scheduleTask(jobParams, context, request);
+    const payload = await createJob(jobParams, context, request);
 
     // store the pending report, puts it in the Reporting Management UI table
     const report = await store.addReport(exportType.jobType, user, payload);
diff --git a/x-pack/plugins/reporting/server/lib/export_types_registry.ts b/x-pack/plugins/reporting/server/lib/export_types_registry.ts
index 501989f21103e7..1159221a9224ea 100644
--- a/x-pack/plugins/reporting/server/lib/export_types_registry.ts
+++ b/x-pack/plugins/reporting/server/lib/export_types_registry.ts
@@ -11,8 +11,8 @@ import { getExportType as getTypePng } from '../export_types/png';
 import { getExportType as getTypePrintablePdf } from '../export_types/printable_pdf';
 import { ExportTypeDefinition } from '../types';
 
-type GetCallbackFn<JobParamsType, ScheduleTaskFnType, JobPayloadType, RunTaskFnType> = (
-  item: ExportTypeDefinition<JobParamsType, ScheduleTaskFnType, JobPayloadType, ScheduleTaskFnType>
+type GetCallbackFn<JobParamsType, CreateJobFnType, JobPayloadType, RunTaskFnType> = (
+  item: ExportTypeDefinition<JobParamsType, CreateJobFnType, JobPayloadType, CreateJobFnType>
 ) => boolean;
 // => ExportTypeDefinition<T, U, V, W>
 
@@ -21,8 +21,8 @@ export class ExportTypesRegistry {
 
   constructor() {}
 
-  register<JobParamsType, ScheduleTaskFnType, JobPayloadType, RunTaskFnType>(
-    item: ExportTypeDefinition<JobParamsType, ScheduleTaskFnType, JobPayloadType, RunTaskFnType>
+  register<JobParamsType, CreateJobFnType, JobPayloadType, RunTaskFnType>(
+    item: ExportTypeDefinition<JobParamsType, CreateJobFnType, JobPayloadType, RunTaskFnType>
   ): void {
     if (!isString(item.id)) {
       throw new Error(`'item' must have a String 'id' property `);
@@ -43,24 +43,24 @@ export class ExportTypesRegistry {
     return this._map.size;
   }
 
-  getById<JobParamsType, ScheduleTaskFnType, JobPayloadType, RunTaskFnType>(
+  getById<JobParamsType, CreateJobFnType, JobPayloadType, RunTaskFnType>(
     id: string
-  ): ExportTypeDefinition<JobParamsType, ScheduleTaskFnType, JobPayloadType, RunTaskFnType> {
+  ): ExportTypeDefinition<JobParamsType, CreateJobFnType, JobPayloadType, RunTaskFnType> {
     if (!this._map.has(id)) {
       throw new Error(`Unknown id ${id}`);
     }
 
     return this._map.get(id) as ExportTypeDefinition<
       JobParamsType,
-      ScheduleTaskFnType,
+      CreateJobFnType,
       JobPayloadType,
       RunTaskFnType
     >;
   }
 
-  get<JobParamsType, ScheduleTaskFnType, JobPayloadType, RunTaskFnType>(
-    findType: GetCallbackFn<JobParamsType, ScheduleTaskFnType, JobPayloadType, RunTaskFnType>
-  ): ExportTypeDefinition<JobParamsType, ScheduleTaskFnType, JobPayloadType, RunTaskFnType> {
+  get<JobParamsType, CreateJobFnType, JobPayloadType, RunTaskFnType>(
+    findType: GetCallbackFn<JobParamsType, CreateJobFnType, JobPayloadType, RunTaskFnType>
+  ): ExportTypeDefinition<JobParamsType, CreateJobFnType, JobPayloadType, RunTaskFnType> {
     let result;
     for (const value of this._map.values()) {
       if (!findType(value)) {
@@ -68,7 +68,7 @@ export class ExportTypesRegistry {
       }
       const foundResult: ExportTypeDefinition<
         JobParamsType,
-        ScheduleTaskFnType,
+        CreateJobFnType,
         JobPayloadType,
         RunTaskFnType
       > = value;
diff --git a/x-pack/plugins/reporting/server/lib/screenshots/get_element_position_data.ts b/x-pack/plugins/reporting/server/lib/screenshots/get_element_position_data.ts
index 4fb9fd96ecfe6d..6c619a726f428c 100644
--- a/x-pack/plugins/reporting/server/lib/screenshots/get_element_position_data.ts
+++ b/x-pack/plugins/reporting/server/lib/screenshots/get_element_position_data.ts
@@ -5,10 +5,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { HeadlessChromiumDriver } from '../../browsers';
-import { AttributesMap, ElementsPositionAndAttribute } from '../../types';
 import { LevelLogger, startTrace } from '../';
+import { HeadlessChromiumDriver } from '../../browsers';
 import { LayoutInstance } from '../layouts';
+import { AttributesMap, ElementsPositionAndAttribute } from './';
 import { CONTEXT_ELEMENTATTRIBUTES } from './constants';
 
 export const getElementPositionAndAttributes = async (
diff --git a/x-pack/plugins/reporting/server/lib/screenshots/get_screenshots.ts b/x-pack/plugins/reporting/server/lib/screenshots/get_screenshots.ts
index bc7b7005674a73..1ed8687bea23eb 100644
--- a/x-pack/plugins/reporting/server/lib/screenshots/get_screenshots.ts
+++ b/x-pack/plugins/reporting/server/lib/screenshots/get_screenshots.ts
@@ -5,9 +5,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { HeadlessChromiumDriver } from '../../browsers';
-import { ElementsPositionAndAttribute, Screenshot } from '../../types';
 import { LevelLogger, startTrace } from '../';
+import { HeadlessChromiumDriver } from '../../browsers';
+import { ElementsPositionAndAttribute, Screenshot } from './';
 
 export const getScreenshots = async (
   browser: HeadlessChromiumDriver,
diff --git a/x-pack/plugins/reporting/server/lib/screenshots/index.ts b/x-pack/plugins/reporting/server/lib/screenshots/index.ts
index 5a04f1a497abf6..c1d33cb5193843 100644
--- a/x-pack/plugins/reporting/server/lib/screenshots/index.ts
+++ b/x-pack/plugins/reporting/server/lib/screenshots/index.ts
@@ -4,4 +4,61 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import * as Rx from 'rxjs';
+import { LevelLogger } from '../';
+import { ConditionalHeaders } from '../../types';
+import { LayoutInstance } from '../layouts';
+
 export { screenshotsObservableFactory } from './observable';
+
+export interface ScreenshotObservableOpts {
+  logger: LevelLogger;
+  urls: string[];
+  conditionalHeaders: ConditionalHeaders;
+  layout: LayoutInstance;
+  browserTimezone: string;
+}
+
+export interface AttributesMap {
+  [key: string]: any;
+}
+
+export interface ElementPosition {
+  boundingClientRect: {
+    // modern browsers support x/y, but older ones don't
+    top: number;
+    left: number;
+    width: number;
+    height: number;
+  };
+  scroll: {
+    x: number;
+    y: number;
+  };
+}
+
+export interface ElementsPositionAndAttribute {
+  position: ElementPosition;
+  attributes: AttributesMap;
+}
+
+export interface Screenshot {
+  base64EncodedData: string;
+  title: string;
+  description: string;
+}
+
+export interface ScreenshotResults {
+  timeRange: string | null;
+  screenshots: Screenshot[];
+  error?: Error;
+  elementsPositionAndAttributes?: ElementsPositionAndAttribute[]; // NOTE: for testing
+}
+
+export type ScreenshotsObservableFn = ({
+  logger,
+  urls,
+  conditionalHeaders,
+  layout,
+  browserTimezone,
+}: ScreenshotObservableOpts) => Rx.Observable<ScreenshotResults[]>;
diff --git a/x-pack/plugins/reporting/server/lib/screenshots/observable.test.ts b/x-pack/plugins/reporting/server/lib/screenshots/observable.test.ts
index b25e8fab3abcf7..3749e4372bdab0 100644
--- a/x-pack/plugins/reporting/server/lib/screenshots/observable.test.ts
+++ b/x-pack/plugins/reporting/server/lib/screenshots/observable.test.ts
@@ -16,11 +16,12 @@ jest.mock('../../browsers/chromium/puppeteer', () => ({
 }));
 
 import * as Rx from 'rxjs';
+import { LevelLogger } from '../';
 import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
 import { HeadlessChromiumDriver } from '../../browsers';
-import { LevelLogger } from '../';
 import { createMockBrowserDriverFactory, createMockLayoutInstance } from '../../test_helpers';
-import { CaptureConfig, ConditionalHeaders, ElementsPositionAndAttribute } from '../../types';
+import { CaptureConfig, ConditionalHeaders } from '../../types';
+import { ElementsPositionAndAttribute } from './';
 import * as contexts from './constants';
 import { screenshotsObservableFactory } from './observable';
 
diff --git a/x-pack/plugins/reporting/server/lib/screenshots/observable.ts b/x-pack/plugins/reporting/server/lib/screenshots/observable.ts
index c6d3d826c88fb0..342293d113d24d 100644
--- a/x-pack/plugins/reporting/server/lib/screenshots/observable.ts
+++ b/x-pack/plugins/reporting/server/lib/screenshots/observable.ts
@@ -17,13 +17,13 @@ import {
   toArray,
 } from 'rxjs/operators';
 import { HeadlessChromiumDriverFactory } from '../../browsers';
+import { CaptureConfig } from '../../types';
 import {
-  CaptureConfig,
   ElementsPositionAndAttribute,
   ScreenshotObservableOpts,
   ScreenshotResults,
   ScreenshotsObservableFn,
-} from '../../types';
+} from './';
 import { checkPageIsOpen } from './check_browser_open';
 import { DEFAULT_PAGELOAD_SELECTOR } from './constants';
 import { getElementPositionAndAttributes } from './get_element_position_data';
diff --git a/x-pack/plugins/reporting/server/lib/store/store.ts b/x-pack/plugins/reporting/server/lib/store/store.ts
index 88f6fa418a1b35..b1309cbdeb94db 100644
--- a/x-pack/plugins/reporting/server/lib/store/store.ts
+++ b/x-pack/plugins/reporting/server/lib/store/store.ts
@@ -7,11 +7,7 @@
 import { ElasticsearchServiceSetup } from 'src/core/server';
 import { LevelLogger, statuses } from '../';
 import { ReportingCore } from '../../';
-import {
-  CreateJobBaseParams,
-  CreateJobBaseParamsEncryptedFields,
-  ReportingUser,
-} from '../../types';
+import { BaseParams, BaseParamsEncryptedFields, ReportingUser } from '../../types';
 import { indexTimestamp } from './index_timestamp';
 import { mapping } from './mapping';
 import { Report } from './report';
@@ -145,7 +141,7 @@ export class ReportingStore {
   public async addReport(
     type: string,
     user: ReportingUser,
-    payload: CreateJobBaseParams & CreateJobBaseParamsEncryptedFields
+    payload: BaseParams & BaseParamsEncryptedFields
   ): Promise<Report> {
     const timestamp = indexTimestamp(this.indexInterval);
     const index = `${this.indexPrefix}-${timestamp}`;
diff --git a/x-pack/plugins/reporting/server/routes/generate_from_jobparams.ts b/x-pack/plugins/reporting/server/routes/generate_from_jobparams.ts
index f4959b56dfea1e..36f0a7fe67d935 100644
--- a/x-pack/plugins/reporting/server/routes/generate_from_jobparams.ts
+++ b/x-pack/plugins/reporting/server/routes/generate_from_jobparams.ts
@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import rison from 'rison-node';
 import { schema } from '@kbn/config-schema';
-import { authorizedUserPreRoutingFactory } from './lib/authorized_user_pre_routing';
-import { HandlerErrorFunction, HandlerFunction } from './types';
+import rison from 'rison-node';
 import { ReportingCore } from '../';
 import { API_BASE_URL } from '../../common/constants';
-import { CreateJobBaseParams } from '../types';
+import { BaseParams } from '../types';
+import { authorizedUserPreRoutingFactory } from './lib/authorized_user_pre_routing';
+import { HandlerErrorFunction, HandlerFunction } from './types';
 
 const BASE_GENERATE = `${API_BASE_URL}/generate`;
 
@@ -70,7 +70,7 @@ export function registerGenerateFromJobParams(
       let jobParams;
 
       try {
-        jobParams = rison.decode(jobParamsRison) as CreateJobBaseParams | null;
+        jobParams = rison.decode(jobParamsRison) as BaseParams | null;
         if (!jobParams) {
           return res.customError({
             statusCode: 400,
diff --git a/x-pack/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts b/x-pack/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts
index a0a8f25de7fc49..517f1dadc0ac15 100644
--- a/x-pack/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts
+++ b/x-pack/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts
@@ -8,7 +8,7 @@ import { schema } from '@kbn/config-schema';
 import { KibanaRequest } from 'src/core/server';
 import { ReportingCore } from '../';
 import { API_BASE_GENERATE_V1 } from '../../common/constants';
-import { scheduleTaskFnFactory } from '../export_types/csv_from_savedobject/create_job';
+import { createJobFnFactory } from '../export_types/csv_from_savedobject/create_job';
 import { runTaskFnFactory } from '../export_types/csv_from_savedobject/execute_job';
 import { JobParamsPostPayloadPanelCsv } from '../export_types/csv_from_savedobject/types';
 import { LevelLogger as Logger } from '../lib';
@@ -43,7 +43,7 @@ export function registerGenerateCsvFromSavedObjectImmediate(
 
   /*
    * CSV export with the `immediate` option does not queue a job with Reporting's ESQueue to run the job async. Instead, this does:
-   *  - re-use the scheduleTask function to build up es query config
+   *  - re-use the createJob function to build up es query config
    *  - re-use the runTask function to run the scan and scroll queries and capture the entire CSV in a result object.
    */
   router.post(
@@ -67,12 +67,12 @@ export function registerGenerateCsvFromSavedObjectImmediate(
     userHandler(async (user, context, req: CsvFromSavedObjectRequest, res) => {
       const logger = parentLogger.clone(['savedobject-csv']);
       const jobParams = getJobParamsFromRequest(req, { isImmediate: true });
-      const scheduleTaskFn = scheduleTaskFnFactory(reporting, logger);
+      const createJob = createJobFnFactory(reporting, logger);
       const runTaskFn = runTaskFnFactory(reporting, logger);
 
       try {
-        // FIXME: no scheduleTaskFn for immediate download
-        const jobDocPayload = await scheduleTaskFn(jobParams, req.headers, context, req);
+        // FIXME: no create job for immediate download
+        const jobDocPayload = await createJob(jobParams, req.headers, context, req);
         const {
           content_type: jobOutputContentType,
           content: jobOutputContent,
diff --git a/x-pack/plugins/reporting/server/routes/generation.test.ts b/x-pack/plugins/reporting/server/routes/generation.test.ts
index cef4da9aabbd47..0db0073149e573 100644
--- a/x-pack/plugins/reporting/server/routes/generation.test.ts
+++ b/x-pack/plugins/reporting/server/routes/generation.test.ts
@@ -75,7 +75,7 @@ describe('POST /api/reporting/generate', () => {
       jobContentEncoding: 'base64',
       jobContentExtension: 'pdf',
       validLicenses: ['basic', 'gold'],
-      scheduleTaskFnFactory: () => () => ({ scheduleParamsTest: { test1: 'yes' } }),
+      createJobFnFactory: () => () => ({ jobParamsTest: { test1: 'yes' } }),
       runTaskFnFactory: () => () => ({ runParamsTest: { test2: 'yes' } }),
     });
     core.getExportTypesRegistry = () => mockExportTypesRegistry;
diff --git a/x-pack/plugins/reporting/server/routes/types.d.ts b/x-pack/plugins/reporting/server/routes/types.d.ts
index ab1dd841bbbc22..5c34d466197fe1 100644
--- a/x-pack/plugins/reporting/server/routes/types.d.ts
+++ b/x-pack/plugins/reporting/server/routes/types.d.ts
@@ -5,12 +5,12 @@
  */
 
 import { KibanaRequest, KibanaResponseFactory, RequestHandlerContext } from 'src/core/server';
-import { CreateJobBaseParams, ReportingUser, ScheduledTaskParams } from '../types';
+import { BaseParams, BasePayload, ReportingUser } from '../types';
 
 export type HandlerFunction = (
   user: ReportingUser,
   exportType: string,
-  jobParams: CreateJobBaseParams,
+  jobParams: BaseParams,
   context: RequestHandlerContext,
   req: KibanaRequest,
   res: KibanaResponseFactory
@@ -22,7 +22,7 @@ export interface QueuedJobPayload<JobParamsType> {
   error?: boolean;
   source: {
     job: {
-      payload: ScheduledTaskParams<JobParamsType>;
+      payload: BasePayload<JobParamsType>;
     };
   };
 }
diff --git a/x-pack/plugins/reporting/server/test_helpers/create_mock_browserdriverfactory.ts b/x-pack/plugins/reporting/server/test_helpers/create_mock_browserdriverfactory.ts
index 08313e6892f3c4..f2785bce10964a 100644
--- a/x-pack/plugins/reporting/server/test_helpers/create_mock_browserdriverfactory.ts
+++ b/x-pack/plugins/reporting/server/test_helpers/create_mock_browserdriverfactory.ts
@@ -8,8 +8,9 @@ import { Page } from 'puppeteer';
 import * as Rx from 'rxjs';
 import { chromium, HeadlessChromiumDriver, HeadlessChromiumDriverFactory } from '../browsers';
 import { LevelLogger } from '../lib';
+import { ElementsPositionAndAttribute } from '../lib/screenshots';
 import * as contexts from '../lib/screenshots/constants';
-import { CaptureConfig, ElementsPositionAndAttribute } from '../types';
+import { CaptureConfig } from '../types';
 
 interface CreateMockBrowserDriverFactoryOpts {
   evaluate: jest.Mock<Promise<any>, any[]>;
diff --git a/x-pack/plugins/reporting/server/types.ts b/x-pack/plugins/reporting/server/types.ts
index 542c9cdb3f6774..10519842d9decd 100644
--- a/x-pack/plugins/reporting/server/types.ts
+++ b/x-pack/plugins/reporting/server/types.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as Rx from 'rxjs';
 import { KibanaRequest, RequestHandlerContext } from 'src/core/server';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { DataPluginStart } from 'src/plugins/data/server/plugin';
@@ -48,7 +47,7 @@ export interface JobParamPostPayload {
 }
 
 // the pre-processed, encrypted data ready for storage
-export interface ScheduledTaskParams<JobParamsType> {
+export interface BasePayload<JobParamsType> {
   headers: string; // serialized encrypted headers
   jobParams: JobParamsType;
   title: string;
@@ -61,7 +60,7 @@ export interface JobSource<JobParamsType> {
   _source: {
     jobtype: string;
     output: TaskRunResult;
-    payload: ScheduledTaskParams<JobParamsType>;
+    payload: BasePayload<JobParamsType>;
     status: JobStatus;
   };
 }
@@ -87,62 +86,6 @@ export interface ConditionalHeaders {
   conditions: ConditionalHeadersConditions;
 }
 
-/*
- * Screenshots
- */
-
-export interface ScreenshotObservableOpts {
-  logger: LevelLogger;
-  urls: string[];
-  conditionalHeaders: ConditionalHeaders;
-  layout: LayoutInstance;
-  browserTimezone: string;
-}
-
-export interface AttributesMap {
-  [key: string]: any;
-}
-
-export interface ElementPosition {
-  boundingClientRect: {
-    // modern browsers support x/y, but older ones don't
-    top: number;
-    left: number;
-    width: number;
-    height: number;
-  };
-  scroll: {
-    x: number;
-    y: number;
-  };
-}
-
-export interface ElementsPositionAndAttribute {
-  position: ElementPosition;
-  attributes: AttributesMap;
-}
-
-export interface Screenshot {
-  base64EncodedData: string;
-  title: string;
-  description: string;
-}
-
-export interface ScreenshotResults {
-  timeRange: string | null;
-  screenshots: Screenshot[];
-  error?: Error;
-  elementsPositionAndAttributes?: ElementsPositionAndAttribute[]; // NOTE: for testing
-}
-
-export type ScreenshotsObservableFn = ({
-  logger,
-  urls,
-  conditionalHeaders,
-  layout,
-  browserTimezone,
-}: ScreenshotObservableOpts) => Rx.Observable<ScreenshotResults[]>;
-
 /*
  * Plugin Contract
  */
@@ -169,34 +112,33 @@ export type ReportingUser = { username: AuthenticatedUser['username'] } | false;
 export type CaptureConfig = ReportingConfigType['capture'];
 export type ScrollConfig = ReportingConfigType['csv']['scroll'];
 
-export interface CreateJobBaseParams {
+export interface BaseParams {
   browserTimezone: string;
   layout?: LayoutInstance; // for screenshot type reports
   objectType: string;
 }
 
-export interface CreateJobBaseParamsEncryptedFields extends CreateJobBaseParams {
+export interface BaseParamsEncryptedFields extends BaseParams {
   basePath?: string; // for screenshot type reports
   headers: string; // encrypted headers
 }
 
-export type CreateJobFn<JobParamsType extends CreateJobBaseParams> = (
+export type CreateJobFn<JobParamsType extends BaseParams> = (
   jobParams: JobParamsType,
   context: RequestHandlerContext,
   request: KibanaRequest
-) => Promise<JobParamsType & CreateJobBaseParamsEncryptedFields>;
+) => Promise<JobParamsType & BaseParamsEncryptedFields>;
 
-// rename me
-export type WorkerExecuteFn<ScheduledTaskParamsType> = (
+export type RunTaskFn<TaskPayloadType> = (
   jobId: string,
-  job: ScheduledTaskParamsType,
+  job: TaskPayloadType,
   cancellationToken: CancellationToken
 ) => Promise<TaskRunResult>;
 
-export type ScheduleTaskFnFactory<ScheduleTaskFnType> = (
+export type CreateJobFnFactory<CreateJobFnType> = (
   reporting: ReportingCore,
   logger: LevelLogger
-) => ScheduleTaskFnType;
+) => CreateJobFnType;
 
 export type RunTaskFnFactory<RunTaskFnType> = (
   reporting: ReportingCore,
@@ -205,7 +147,7 @@ export type RunTaskFnFactory<RunTaskFnType> = (
 
 export interface ExportTypeDefinition<
   JobParamsType,
-  ScheduleTaskFnType,
+  CreateJobFnType,
   JobPayloadType,
   RunTaskFnType
 > {
@@ -214,7 +156,7 @@ export interface ExportTypeDefinition<
   jobType: string;
   jobContentEncoding?: string;
   jobContentExtension: string;
-  scheduleTaskFnFactory: ScheduleTaskFnFactory<ScheduleTaskFnType>;
+  createJobFnFactory: CreateJobFnFactory<CreateJobFnType>;
   runTaskFnFactory: RunTaskFnFactory<RunTaskFnType>;
   validLicenses: string[];
 }