diff --git a/docs/source/_data/sidebar.yml b/docs/source/_data/sidebar.yml
index 1653724f4c..fb8a5e945c 100644
--- a/docs/source/_data/sidebar.yml
+++ b/docs/source/_data/sidebar.yml
@@ -5,10 +5,10 @@ guides:
     writing-your-first-test: writing-your-first-test.html
     testing-your-app: testing-your-app.html
     next-steps: next-steps.html
-  cypress-basics:
-    overview-of-the-gui-tool: overview-of-the-gui-tool.html
-    core-concepts: core-concepts.html
+  core-concepts:
+    cypress-in-a-nutshell: cypress-in-a-nutshell.html
     organizing-tests: organizing-tests.html
+    overview-of-the-gui-tool: overview-of-the-gui-tool.html
     aliases-variables-in-an-async-world: aliases-variables-in-an-async-world.html
     dead-simple-debugging: dead-simple-debugging.html
     stubs-spies-clocks: stubs-spies-clocks.html
diff --git a/docs/source/guides/cypress-basics/aliases-variables-in-an-async-world.md b/docs/source/guides/core-concepts/aliases-variables-in-an-async-world.md
similarity index 100%
rename from docs/source/guides/cypress-basics/aliases-variables-in-an-async-world.md
rename to docs/source/guides/core-concepts/aliases-variables-in-an-async-world.md
diff --git a/docs/source/guides/cypress-basics/core-concepts.md b/docs/source/guides/core-concepts/cypress-in-a-nutshell.md
similarity index 98%
rename from docs/source/guides/cypress-basics/core-concepts.md
rename to docs/source/guides/core-concepts/cypress-in-a-nutshell.md
index b2c017c5f8..83d9b429c7 100644
--- a/docs/source/guides/cypress-basics/core-concepts.md
+++ b/docs/source/guides/core-concepts/cypress-in-a-nutshell.md
@@ -1,4 +1,4 @@
-title: Core Concepts
+title: Cypress in a Nutshell
 comments: true
 ---
 
@@ -20,21 +20,21 @@ Expressivity is all about getting more done with less typing. Let's look at an e
 ```js
 describe("Post Resource", function() {
   it("Creating a new Post", function() {
-    cy.visit("/posts/new") // 1.
+    cy.visit("/posts/new")     // 1.
 
     cy.get("input.post-title") // 2.
-      .type("My First Post") // 3.
+      .type("My First Post")   // 3.
 
-    cy.get("input.post-body") // 4.
-      .type("Hello, world!") // 5.
+    cy.get("input.post-body")  // 4.
+      .type("Hello, world!")   // 5.
 
-    cy.get('button[type="submit"]') // 6.
-      .click() // 7.
+    cy.contains('Submit')      // 6.
+      .click()                 // 7.
 
-    cy.url() // 8.
+    cy.url()                   // 8.
       .should("eq", "/posts/my-first-post")
 
-    cy.get('h1') // 9.
+    cy.get('h1')               // 9.
       .its('value')
       .should("eq", "My First Post")
   })
@@ -49,7 +49,7 @@ Can you read this? If you did, it might sound something like this:
 3. Type "My First Post" into it.
 4. Find the `<input>` with class `post-body`.
 5. Type "Hello, world!" into it.
-6. Select the `<button>` tag with a type of `submit`.
+6. Find the element containing the text `Submit`.
 7. Click it.
 8. Grab the browser URL, ensure it is `/posts/my-first-post`.
 9. Select the `<h1>` tag, ensure it contains the text "My First Post".
diff --git a/docs/source/guides/cypress-basics/dead-simple-debugging.md b/docs/source/guides/core-concepts/dead-simple-debugging.md
similarity index 100%
rename from docs/source/guides/cypress-basics/dead-simple-debugging.md
rename to docs/source/guides/core-concepts/dead-simple-debugging.md
diff --git a/docs/source/guides/cypress-basics/dealing-with-the-network.md b/docs/source/guides/core-concepts/dealing-with-the-network.md
similarity index 100%
rename from docs/source/guides/cypress-basics/dealing-with-the-network.md
rename to docs/source/guides/core-concepts/dealing-with-the-network.md
diff --git a/docs/source/guides/cypress-basics/organizing-tests.md b/docs/source/guides/core-concepts/organizing-tests.md
similarity index 100%
rename from docs/source/guides/cypress-basics/organizing-tests.md
rename to docs/source/guides/core-concepts/organizing-tests.md
diff --git a/docs/source/guides/cypress-basics/overview-of-the-gui-tool.md b/docs/source/guides/core-concepts/overview-of-the-gui-tool.md
similarity index 100%
rename from docs/source/guides/cypress-basics/overview-of-the-gui-tool.md
rename to docs/source/guides/core-concepts/overview-of-the-gui-tool.md
diff --git a/docs/source/guides/cypress-basics/stubs-spies-clocks.md b/docs/source/guides/core-concepts/stubs-spies-clocks.md
similarity index 100%
rename from docs/source/guides/cypress-basics/stubs-spies-clocks.md
rename to docs/source/guides/core-concepts/stubs-spies-clocks.md
diff --git a/docs/source/guides/cypress-basics/taking-screenshots-and-recording-videos.md b/docs/source/guides/core-concepts/taking-screenshots-and-recording-videos.md
similarity index 100%
rename from docs/source/guides/cypress-basics/taking-screenshots-and-recording-videos.md
rename to docs/source/guides/core-concepts/taking-screenshots-and-recording-videos.md
diff --git a/docs/themes/cypress/languages/en.yml b/docs/themes/cypress/languages/en.yml
index ecf1e4d50f..73d24e7f30 100644
--- a/docs/themes/cypress/languages/en.yml
+++ b/docs/themes/cypress/languages/en.yml
@@ -24,10 +24,10 @@ sidebar:
     writing-your-first-test: Writing Your First Test
     testing-your-app: Testing Your App
     next-steps: Next Steps
-    cypress-basics: Basics
-    overview-of-the-gui-tool: Overview of the GUI Tool
     core-concepts: Core Concepts
+    cypress-in-a-nutshell: Cypress in a Nutshell
     organizing-tests: Organizing Tests
+    overview-of-the-gui-tool: Overview of the GUI Tool
     dead-simple-debugging: Dead Simple Debugging
     aliases-variables-in-an-async-world: Aliases&#58; Variables in an Async World
     stubs-spies-clocks: Stubs, Spies, and Clocks