diff --git a/package.json b/package.json
index 25100a88..1052710b 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
   "main": "dist/react-final-form.cjs.js",
   "jsnext:main": "dist/react-final-form.es.js",
   "module": "dist/react-final-form.es.js",
+  "typings": "dist/index.d.ts",
   "files": ["dist"],
   "scripts": {
     "start": "nps",
diff --git a/src/ReactFinalForm.js b/src/ReactFinalForm.js
index bb4ee337..c47b78ef 100644
--- a/src/ReactFinalForm.js
+++ b/src/ReactFinalForm.js
@@ -8,7 +8,7 @@ import {
   version as ffVersion
 } from 'final-form'
 import type {
-  Api,
+  FormApi,
   Config,
   FormSubscription,
   FormState,
@@ -35,7 +35,7 @@ export default class ReactFinalForm extends React.PureComponent<Props, State> {
   context: ReactContext
   props: Props
   state: State
-  form: Api
+  form: FormApi
   unsubscriptions: Unsubscribe[]
 
   static childContextTypes = {
diff --git a/src/index.d.ts b/src/index.d.ts
index f87ba5cf..122401f0 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -1,8 +1,8 @@
 import * as React from 'react'
-import { Api, Config, Decorator, FormState, FormSubscription, FieldSubscription } from 'final-form'
+import { FormApi, Config, Decorator, FormState, FormSubscription, FieldSubscription } from 'final-form'
 
 export type ReactContext = {
-  reactFinalForm: Api
+  reactFinalForm: FormApi
 }
 
 export type FieldRenderProps = {
diff --git a/src/types.js.flow b/src/types.js.flow
index ee2f4005..2620feb1 100644
--- a/src/types.js.flow
+++ b/src/types.js.flow
@@ -1,7 +1,7 @@
 // @flow
 import * as React from 'react'
 import type {
-  Api,
+  FormApi,
   Config,
   Decorator,
   FormState,
@@ -10,7 +10,7 @@ import type {
 } from 'final-form'
 
 export type ReactContext = {
-  reactFinalForm: Api
+  reactFinalForm: FormApi
 }
 
 export type FieldRenderProps = {