diff --git a/README.md b/README.md
index 3032964d..8040f899 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ steps:
 - uses: actions/checkout@master
 - uses: actions/setup-python@v1
   with:
-    version: '3.x' // Version range or exact version of a Python version to use, using semvers version range syntax.
+    python-version: '3.x' // Version range or exact version of a Python version to use, using semvers version range syntax.
     architecture: 'x64' // (x64 or x86)
 - run: python my_script.py
 ```
@@ -38,7 +38,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v1
         with:
-          version: ${{ matrix.python }}
+          python-version: ${{ matrix.python }}
           architecture: x64
       - run: python my_script.py
 ```
diff --git a/action.yml b/action.yml
index 41344866..0c04aede 100644
--- a/action.yml
+++ b/action.yml
@@ -1,13 +1,16 @@
 name: 'Setup Python environment'
 description: 'Setup a Python environment and add it to the PATH, additionally providing proxy support'
 author: 'GitHub'
-inputs: 
-  version:
+inputs:
+  python-version:
     description: 'Version range or exact version of a Python version to use, using semvers version range syntax.'
     default: '3.x'
   architecture:
     description: 'The target architecture (x86, x64) of the Python interpreter.'
     default: 'x64'
+# Deprecated option, do not use. Will not be supported after October 1, 2019
+  version:
+    description: 'Deprecated. Use python-version instead. Will not be supported after October 1, 2019'
 runs:
   using: 'node12'
   main: 'lib/setup-python.js'
diff --git a/lib/setup-python.js b/lib/setup-python.js
index 7b7fe07c..ecbf6111 100644
--- a/lib/setup-python.js
+++ b/lib/setup-python.js
@@ -21,7 +21,10 @@ const path = __importStar(require("path"));
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const version = core.getInput('version');
+            let version = core.getInput('version');
+            if (!version) {
+                version = core.getInput('python-version');
+            }
             if (version) {
                 const arch = core.getInput('architecture', { required: true });
                 yield finder.findPythonVersion(version, arch);
diff --git a/src/setup-python.ts b/src/setup-python.ts
index 68540d88..3f72debe 100644
--- a/src/setup-python.ts
+++ b/src/setup-python.ts
@@ -4,7 +4,10 @@ import * as path from 'path';
 
 async function run() {
   try {
-    const version: string = core.getInput('version');
+    let version = core.getInput('version');
+    if (!version) {
+      version = core.getInput('python-version');
+    }
     if (version) {
       const arch: string = core.getInput('architecture', {required: true});
       await finder.findPythonVersion(version, arch);