diff --git a/README.md b/README.md
index 62d26cc..c37262e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # React.js Koans
 
-If you want to learn React.js you came to the right place. We prepared a set of practical exercises that will help you learn React.js from square one. The only thing you need to know is JavaScript. Here we are using [ECMAScript 2015 standard](https://babeljs.io/docs/learn-es2015/).
+If you want to learn React.js you came to the right place. We prepared a set of practical koans that will help you learn React.js from square one. The only thing you need to know is JavaScript. Here we are using [ECMAScript 2015 standard](https://babeljs.io/docs/learn-es2015/).
 
 The Koans are a set of tasks to complete. Prepared tests checks if they are done correctly.
 
@@ -14,9 +14,8 @@ Make sure you have Node.js and Python 2 installed.
 
 ## Koans structure
 
- * Edit the files found in the **`exercises`** directory.
- * The `koans` directory contains the source of all the exercises. `test` contains the tests.
- * `src` contains files compiled from `exercises`.
+ * Edit the files found in the **`koans`** directory.
+ * The `koans` directory contains the source of all the koans. `test` contains the tests.
  * `build` contains sources launched in the web browser version of Koans.
 
 ## Start a local web server (optional)
@@ -29,8 +28,8 @@ You can run a webserver and see your changes live in your web browser:
 ## Instructions
 
   1. Remember about running the setup script before you start working on Koans!
-  2. Work on the code found in the `exercises` directory and run the tests to see if you did everything right.
-  3. You need to do the exercises in the given order.
+  2. Work on the code found in the `koans` directory and run the tests to see if you did everything right.
+  3. You need to do the koans in the given order.
   4. Try to not peek at the test files! They contain spoilers.
   5. To run the tests, use `npm run test`. To automatically run tests when your code changes, use `npm run watch`.
 
diff --git a/koans/01-HelloWorld.jsx b/koans/01-HelloWorld.jsx
index 1590b81..467e72c 100644
--- a/koans/01-HelloWorld.jsx
+++ b/koans/01-HelloWorld.jsx
@@ -23,7 +23,7 @@ class HelloWorld extends React.Component {
 
   render() {
     return (
-        <div>FILL ME IN!</div>
+        <div>FILL ME IN</div>
     );
   }
 }
diff --git a/koans/02-PartiesList.jsx b/koans/02-PartiesList.jsx
index 7eb9329..abc735d 100644
--- a/koans/02-PartiesList.jsx
+++ b/koans/02-PartiesList.jsx
@@ -11,7 +11,7 @@ class PartiesList extends React.Component {
   // Doesn't this code look familiar to you?
   render() {
     return (
-      <ul className="FILL ME">
+      <ul className="FILL IN">
         <li>Party at Aperture Laboratories</li>
       </ul>
     );
diff --git a/koans/04-Quiz.jsx b/koans/04-Quiz.jsx
index 5c8efb5..628628e 100644
--- a/koans/04-Quiz.jsx
+++ b/koans/04-Quiz.jsx
@@ -2,7 +2,7 @@
 
 var Answers = {
   // Question #1: What is the name of the class that we extend to create components class?
-  // Tip: See any of the exercises
+  // Tip: See any of the koans
   answer1: "Enter your answer here",
 
   // Question #2: JSX is converted directly into JavaScript. True or false?
diff --git a/package.json b/package.json
index 0d3e377..ea71cce 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,11 @@
   "description": "React.js Koans",
   "main": "index.js",
   "scripts": {
-    "compile": "babel exercises --out-dir src",
-    "setup": "npm install && ncp koans/ exercises/",
+    "compile": "babel koans --out-dir src",
+    "setup": "npm install && ncp koans/",
     "start": "npm run compile && nodemon server.js",
     "test": "npm run compile && mocha -b --compilers js:babel/register --require test/helpers.js test/**/*.js || echo",
-    "watch": "onchange exercises/*.jsx -- npm run test"
+    "watch": "onchange koans/*.jsx -- npm run test"
   },
   "repository": {
     "type": "git",
diff --git a/server.js b/server.js
index 0d71b86..05d39ae 100644
--- a/server.js
+++ b/server.js
@@ -27,4 +27,4 @@ new WebpackDevServer(webpack(config), {
 
 var server = app.listen(8080, function () {
   console.log('Listening at http://localhost:%s', server.address().port);
-});
\ No newline at end of file
+});
diff --git a/webpack.config.js b/webpack.config.js
index cd0d77b..48c9233 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -6,7 +6,7 @@ module.exports = {
   entry: [
     'webpack-dev-server/client?http://localhost:9090',
     'webpack/hot/only-dev-server',
-    './exercises/main'
+    './koans/main'
   ],
 
   output: {
@@ -17,7 +17,7 @@ module.exports = {
 
   module: {
     loaders: [
-      { test: path.join(__dirname, 'exercises'), loaders: ['react-hot', 'babel-loader']}
+      { test: path.join(__dirname, 'koans'), loaders: ['react-hot', 'babel-loader']}
     ]
   },