diff --git a/.circleci/config.yml b/.circleci/config.yml
index 975ddc67209a..95af3d26fe80 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,7 +40,7 @@ jobs:
             - addons
             - app
             - lib
-  example-kitchen-sinks:
+  examples:
     <<: *defaults
     steps:
       - checkout
@@ -217,7 +217,7 @@ jobs:
       - run:
           name: Lint
           command: yarn lint
-  unit-test:
+  test:
     <<: *defaults
     steps:
       - checkout
@@ -239,7 +239,7 @@ jobs:
       - run:
           name: Upload coverage
           command: yarn coverage
-  cli:
+  cli-test:
     <<: *defaults
     environment:
       BASH_ENV: ~/.bashrc
@@ -251,7 +251,7 @@ jobs:
           name: Test
           command: yarn test --cli
           no_output_timeout: 1800
-  cli-latest-cra:
+  cli-test-latest-cra:
     <<: *defaults
     environment:
       BASH_ENV: ~/.bashrc
@@ -272,7 +272,7 @@ workflows:
           requires:
             - docs
             - build
-      - example-kitchen-sinks:
+      - examples:
           requires:
             - build
       - smoke-tests:
@@ -281,15 +281,15 @@ workflows:
       - native-smoke-tests:
           requires:
             - build
-      - unit-test:
+      - test:
           requires:
             - build
       - coverage:
           requires:
-            - unit-test
-      - cli:
+            - test
+      - cli-test:
           requires:
             - build
-      - cli-latest-cra:
+      - cli-test-latest-cra:
           requires:
             - build
diff --git a/.teamcity/OpenSourceProjects_Storybook/Project.kt b/.teamcity/OpenSourceProjects_Storybook/Project.kt
index b20affdbf82a..a3b5a60463fd 100644
--- a/.teamcity/OpenSourceProjects_Storybook/Project.kt
+++ b/.teamcity/OpenSourceProjects_Storybook/Project.kt
@@ -21,7 +21,7 @@ object Project : Project({
     buildType(OpenSourceProjects_Storybook_CliTestLatestCra)
     buildType(OpenSourceProjects_Storybook_Examples)
     buildType(OpenSourceProjects_Storybook_Danger)
-    buildType(OpenSourceProjects_Storybook_ReactNative)
+    buildType(OpenSourceProjects_Storybook_NativeSmokeTests)
     buildType(OpenSourceProjects_Storybook_Docs)
     buildType(OpenSourceProjects_Storybook_Build_2)
     buildType(OpenSourceProjects_Storybook_CliTest)
diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Build_2.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Build_2.kt
index 831eb2adc72f..2944f6991339 100644
--- a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Build_2.kt
+++ b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Build_2.kt
@@ -89,7 +89,7 @@ object OpenSourceProjects_Storybook_Build_2 : BuildType({
                 onDependencyCancel = FailureAction.ADD_PROBLEM
             }
         }
-        dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_ReactNative) {
+        dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_NativeSmokeTests) {
             snapshot {
                 onDependencyCancel = FailureAction.ADD_PROBLEM
             }
diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_ReactNative.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_NativeSmokeTests.kt
similarity index 90%
rename from .teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_ReactNative.kt
rename to .teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_NativeSmokeTests.kt
index f2f058e90f23..677943e47f1c 100644
--- a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_ReactNative.kt
+++ b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_NativeSmokeTests.kt
@@ -4,10 +4,10 @@ import jetbrains.buildServer.configs.kotlin.v2017_2.*
 import jetbrains.buildServer.configs.kotlin.v2017_2.buildFeatures.commitStatusPublisher
 import jetbrains.buildServer.configs.kotlin.v2017_2.buildSteps.script
 
-object OpenSourceProjects_Storybook_ReactNative : BuildType({
+object OpenSourceProjects_Storybook_NativeSmokeTests : BuildType({
     uuid = "ac276912-df1a-44f1-8de2-056276193ce8"
-    id = "OpenSourceProjects_Storybook_ReactNative"
-    name = "React Native"
+    id = "OpenSourceProjects_Storybook_NativeSmokeTests"
+    name = "Native Smoke Tests"
 
     params {
         param("env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD", "true")
diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_SBNext.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_SBNext.kt
deleted file mode 100644
index d46dc1073a28..000000000000
--- a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_SBNext.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package OpenSourceProjects_Storybook.buildTypes
-
-import jetbrains.buildServer.configs.kotlin.v2017_2.*
-import jetbrains.buildServer.configs.kotlin.v2017_2.buildFeatures.commitStatusPublisher
-import jetbrains.buildServer.configs.kotlin.v2017_2.buildSteps.script
-import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.BuildFailureOnMetric
-import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.failOnMetricChange
-import jetbrains.buildServer.configs.kotlin.v2017_2.triggers.VcsTrigger
-import jetbrains.buildServer.configs.kotlin.v2017_2.triggers.vcs
-
-object OpenSourceProjects_Storybook_SBNext : BuildType({
-    uuid = "dc66f07a-281f-4434-97ca-f1480b7cfc51"
-    id = "OpenSourceProjects_Storybook_SBNext"
-    name = "SBNext"
-
-    artifactRules = "ui/out => demo.zip"
-
-    vcs {
-        root("OpenSourceProjects_Storybook_SBNext")
-
-    }
-
-    steps {
-        script {
-            name = "Install"
-            scriptContent = "yarn"
-            dockerImage = "node:%docker.node.version%"
-        }
-        script {
-            name = "Lint"
-            scriptContent = "yarn lint"
-            dockerImage = "node:%docker.node.version%"
-        }
-        script {
-            name = "Test"
-            enabled = false
-            scriptContent = "yarn test"
-            dockerImage = "node:%docker.node.version%"
-        }
-        script {
-            name = "Build"
-            workingDir = "server"
-            scriptContent = "yarn build"
-            dockerImage = "node:%docker.node.version%"
-        }
-        script {
-            name = "Export"
-            workingDir = "demo"
-            scriptContent = "yarn export"
-            dockerImage = "node:%docker.node.version%"
-        }
-    }
-
-    triggers {
-        vcs {
-        }
-    }
-
-    requirements {
-        doesNotContain("env.OS", "Windows")
-    }
-})
diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Test.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Test.kt
index e746c966987d..0565f052fbb1 100644
--- a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Test.kt
+++ b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Test.kt
@@ -28,10 +28,7 @@ object OpenSourceProjects_Storybook_Test : BuildType({
         }
         script {
             name = "Test"
-            scriptContent = """
-                yarn test --core --coverage --runInBand --teamcity
-                yarn coverage
-            """.trimIndent()
+            scriptContent = "yarn test --core --coverage --runInBand --teamcity"
             dockerImage = "node:%docker.node.version%"
         }
     }
diff --git a/scripts/netlify-build.sh b/scripts/netlify-build.sh
index a31ba04f6218..0cd5de9b7077 100755
--- a/scripts/netlify-build.sh
+++ b/scripts/netlify-build.sh
@@ -84,14 +84,6 @@ elif [ "$BUILD_CONTEXT" = "OFFICIAL" ]; then
   yarn build-storybook
   mv storybook-static ../../netlify-build
   popd
-elif [ "$BUILD_CONTEXT" = "HYPERAPP" ]; then
-  # TEMP so we don't get broken builds from netlify
-  echo "netlify-build hyperapp examples"
-  pushd examples/official-storybook
-  yarn
-  yarn build-storybook
-  mv storybook-static ../../netlify-build
-  popd
 elif [ "$BUILD_CONTEXT" = "RIOT" ]; then
   echo "netlify-build riot examples"
   pushd examples/riot-kitchen-sink