diff --git a/404.md b/404.md
index 149ca89e7..d210cca1f 100644
--- a/404.md
+++ b/404.md
@@ -5,7 +5,7 @@ showBreadcrumbs: false
 sitemap: false
 ---
 
-**The Page you requested doesn't exist. Sorry about that. If we did something wrong, let us know at
+**The page you requested doesn't exist. Sorry about that. If we did something wrong, let us know at
 [support@keboola.com](mailto:support@keboola.com).**
 
 {: .text-center}
@@ -13,10 +13,10 @@ sitemap: false
 
 If you are looking for some other stuff that does not exist, you might want to visit:
 
-- [connection.keboola.com](https://connection.keboola.com) -- for logging in into KBC
-- [status.keboola.com](https://status.keboola.com/) -- for getting KBC Status updates (service status and changelog); we recommend subscribing to the feed or monitoring it in a Slack channel to keep up to date.
-- [help.keboola.com](https://help.keboola.com) -- for general help with using KBC
-- [developers.keboola.com](https://developers.keboola.com) -- for developing a KBC extension
+- [connection.keboola.com](https://connection.keboola.com) -- for logging in into Keboola
+- [status.keboola.com](https://status.keboola.com/) -- for getting Keboola Status updates (service status and changelog); we recommend subscribing to the feed or monitoring it in a Slack channel to keep up to date.
+- [help.keboola.com](https://help.keboola.com) -- for general help with using Keboola
+- [developers.keboola.com](https://developers.keboola.com) -- for developing a Keboola extension
 - [blog.keboola.com](https://blog.keboola.com/) -- something to read for data analysts
 - [500.keboola.com](https://500.keboola.com/) -- something to read for tech geeks
 
diff --git a/_layouts/default.html b/_layouts/default.html
index fc32b98ef..43ab7a6c2 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -6,7 +6,7 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<meta name="author" content="Keboola">
-	<title>{{ page.title }} | Keboola Connection User Documentation</title>
+	<title>{{ page.title }} | Keboola User Documentation</title>
 	<script src="https://ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js"></script>
 	<script>
       WebFont.load({
diff --git a/catalog/multi-project/index.md b/catalog/multi-project/index.md
index 8b358dc5a..292a80bd4 100644
--- a/catalog/multi-project/index.md
+++ b/catalog/multi-project/index.md
@@ -6,7 +6,7 @@ permalink: /catalog/multi-project/
 * TOC
 {:toc}
 
-Keboola Connection is a very versatile platform and can be used in many different ways. When you deal with a larger number of source 
+Keboola is a very versatile platform and can be used in many different ways. When you deal with a larger number of source 
 and destination systems, or when some of them are very complex or difficult to set up, you might consider splitting the
 traditional extract-load process into isolated projects.
 
@@ -22,12 +22,12 @@ over again.
 - etc.
 
 The multi project architecture is a solution to these kinds of problems. It is not really any sort of architecture, it is 
-only a *usage pattern* of the Keboola Connection platform. The idea is to create separate projects for receiving,
+only a *usage pattern* of the Keboola platform. The idea is to create separate projects for receiving,
 analyzing and writing data. The projects structure can follow the organization structure, technological structure, or
 anything else really.
 
 ## Example Scenario
-Let's say that you have an existing Keboola Connection project that contains:
+Let's say that you have an existing Keboola project that contains:
 
 - Oracle database extractor with the following configurations:
     - `ora-history` -- The source database is over 2TB; the largest table is `op_history`, which can be easily loaded [incrementally](/storage/tables/#incremental-loading) as records are only added; it is updated every 10 minutes.
@@ -80,7 +80,7 @@ working immediately. If the word "everyone" in the above statement is undesired,
 anything in the database schema, they can do that in an unlimited number of arbitrarily sized steps, provided that the shared data 
 remains same. For that they can use the entire power of SQL, Python, R and Julia transformations combined. This is a much more flexible 
 solution then the traditional way of creating views. Then there is, of course, the advantage that you can work with the Oracle data 
-even when the server is down; but that's integral part of Keboola Connection.
+even when the server is down; but that's integral part of Keboola.
 
 On a very high level, the following schema represents a single project setup:
 
diff --git a/components/applications/ai/generative-ai/index.md b/components/applications/ai/generative-ai/index.md
index abed33944..b77cb3723 100644
--- a/components/applications/ai/generative-ai/index.md
+++ b/components/applications/ai/generative-ai/index.md
@@ -8,7 +8,7 @@ redirect_from:
 * TOC
 {:toc}
 
-The Generative AI application allows you to query both [OpenAI](https://platform.openai.com/docs) and [Azure OpenAI](https://learn.microsoft.com/en-us/azure/ai-services/openai/overview) models using data from your Keboola Connection project.
+The Generative AI application allows you to query both [OpenAI](https://platform.openai.com/docs) and [Azure OpenAI](https://learn.microsoft.com/en-us/azure/ai-services/openai/overview) models using data from your Keboola project.
 
 ## Create New Configuration
 
diff --git a/components/applications/index.md b/components/applications/index.md
index 1bb2eea49..5ce0c2235 100644
--- a/components/applications/index.md
+++ b/components/applications/index.md
@@ -21,26 +21,26 @@ All applications are **implemented as [components](https://developers.keboola.co
 and as such can be completely created by 3rd party developers. 
 You can even create your own application. 
 Applications can be created either for a particular end-user, or they may be offered 
-to all Keboola Connection customers; in that case they have to be registered in Keboola Connection [Developer Portal](https://components.keboola.com/).
+to all Keboola customers; in that case they have to be registered in Keboola [Developer Portal](https://components.keboola.com/).
 
 Applications may
 
 - vary in terms and conditions.
 - be billed extra; some are for free.
-- send your data to 3rd party services outside of Keboola Connection.
+- send your data to 3rd party services outside of Keboola.
 - extract data from outside sources.
 - be created by you, Keboola, or third parties. 
 - have support provided by their author. 
 
-The following screenshot shows some of many Keboola Connection applications (created by both, Keboola and 3rd parties): 
+The following screenshot shows some of many Keboola applications (created by both, Keboola and 3rd parties): 
 
 {: .image-popup}
-![Keboola and 3rd parties Applications in KBC](/components/applications/applications.png)
+![Keboola and 3rd parties Applications in Keboola](/components/applications/applications.png)
 
 If you want to learn more about Applications or are interested in creating one, go to 
 our [Developer Documentation](https://developers.keboola.com/extend/).
 
-If you want to see a short **demo on using a 3rd party app in Keboola Connection** (analyzing text data), [click here](https://www.youtube.com/watch?v=dx03hlA7dTo). 
+If you want to see a short **demo on using a 3rd party app in Keboola** (analyzing text data), [click here](https://www.youtube.com/watch?v=dx03hlA7dTo). 
 The video shows how to quickly extract text data from Twitter's API, process the data through Geneea's
 natural language processing algorithm and visualise the results in Tableau.
 
@@ -52,16 +52,16 @@ Application and Transformations share many common properties. However, they diff
 - Both Transformations and Applications can be used in your orchestrations in exactly the same way.
 - The code of most R and Python Transformations can be used in Applications and vice versa, with none or
 very few modifications.
-- The Keboola Connection programming interfaces for Applications and Transformations are highly similar.
+- The Keboola programming interfaces for Applications and Transformations are highly similar.
 
 **Differences:**
 
-- The code in Transformations is visible to everyone in the Keboola Connection project. The application code can be hidden.
+- The code in Transformations is visible to everyone in the Keboola project. The application code can be hidden.
 - The Transformation code is tied to a specific project. To share the code across different projects,
 use Application.
-- Transformations are versioned as changes in the configuration in the Keboola Connection project.
+- Transformations are versioned as changes in the configuration in the Keboola project.
 Applications are versioned externally.
-- Applications can be created for you by 3rd parties, with some or even no access to your Keboola Connection project.
+- Applications can be created for you by 3rd parties, with some or even no access to your Keboola project.
 - There are also some [technical differences](https://developers.keboola.com/extend/custom-science/#technical-differences) between the two.
 
 When deciding between the two, consider your capabilities, available resources and the
diff --git a/components/applications/triggers/orchestration-trigger-queue-v2/index.md b/components/applications/triggers/orchestration-trigger-queue-v2/index.md
index 1b1ee0c06..b8a29ed50 100644
--- a/components/applications/triggers/orchestration-trigger-queue-v2/index.md
+++ b/components/applications/triggers/orchestration-trigger-queue-v2/index.md
@@ -6,11 +6,11 @@ permalink: /components/applications/triggers/orchestration-trigger-queue-v2/
 * TOC
 {:toc}
 
-Trigger to start a Keboola Orchestration V2 across different Keboola Connection projects.
+Trigger to start a Keboola Orchestration V2 across different Keboola projects.
 
 ## Authorization
 
-Authorization is done with a [KBC Storage API token](https://help.keboola.com/management/project/tokens).
+Authorization is done with a [Keboola Storage API token](https://help.keboola.com/management/project/tokens).
 Generate a dedicated API token with either:
 
 * Full access to all buckets and components.
@@ -24,8 +24,8 @@ If the second option is chosen, you must create a new token with further permiss
 {: .image-popup}
 ![Screenshot - Incremental fetching](/components/applications/triggers/orchestration-trigger-queue-v2/config.png)
 
-* Fill in the KBC Storage API token. 
-* Fill in the KBC stack based on your stack, you can find this out from the link to your keboola project
+* Fill in the Keboola Storage API token. 
+* Fill in the Keboola stack based on your stack, you can find this out from the link to your keboola project
 * Fill in the Orchestration ID 
 * Check or uncheck the checkbox for "Wait for job finish and check jobs status". 
   If checked, the job of the trigger will only finish when 
diff --git a/components/branches/index.md b/components/branches/index.md
index 02fdb5277..1a81ae3b3 100644
--- a/components/branches/index.md
+++ b/components/branches/index.md
@@ -31,7 +31,7 @@ from the Storage as if it were a normal configuration. However, when your branch
 (tables or files) to Storage, it is stored separately and does not overwrite the original production data and interfere
 with the running configurations. There is no need to duplicate your project's data when creating a new branch. 
 
-### Data pipelines
+### Data Pipelines
 
 When you create an extractor and then transform the data it produces using transformation it behaves the following way in branches: 
 
@@ -84,18 +84,18 @@ You can end your branch's lifecycle in two ways:
 **Important:** All this happens in a same project, allowing you to collaborate on the modifications with other members 
 of the project.
 
-## Component considerations
+## Component Considerations
 
 Certain components are not allowed to run in development branches. There are following special cases where components' functionality is limited in the development branches.
 
-### Working with external resources
+### Working with External Resources
 
-Some components, like writers, can write to a destination that is external to Keboola Connection. Those components'
+Some components, like writers, can write to a destination that is external to Keboola. Those components'
 configs are first marked as *unsafe* in development branch.
 
 You will not be able to run an unsafe config. You need to first observe the config and verify that it's either OK to
 write to the destination, or change the destination accordingly.
 
-### OAuth authorized components
+### OAuth Authorized Components
 
 Components using OAuth does not allow authorizing nor changing the OAuth in development branch. The OAuth authorization tokens are shared with production so changing them might break the production pipeline.
diff --git a/components/data-apps/index.md b/components/data-apps/index.md
index c1d1803bc..01523b792 100644
--- a/components/data-apps/index.md
+++ b/components/data-apps/index.md
@@ -18,12 +18,12 @@ customized internal reporting tools for business teams, financial apps to get in
 Data apps may be written in any language. However, for now Keboola only supports apps written in [Streamlit](https://streamlit.io/), 
 which is a Python framework for rapid development of such applications.
 
-As mentioned above, a data app is a simple web application, which can be deployed inside a Keboola Connection project 
+As mentioned above, a data app is a simple web application, which can be deployed inside a Keboola project 
 and also publicly accessed from outside the project. 
-It means that the users that will access your data app don't need access to a Keboola Connection project.
+It means that the users that will access your data app don't need access to a Keboola project.
 
 ## Create a Data App
-There are two ways to create a data app in Keboola Connection. Select a deployment type that will suit your needs:
+There are two ways to create a data app in Keboola. Select a deployment type that will suit your needs:
 - **Code** – Just paste a Streamlit code to create a simple data app. 
 - **Git repository** – Specify a git repository with Streamlit app sources. This is more suitable for complex applications.
 
@@ -62,14 +62,14 @@ These secrets will be injected into the secrets.toml file upon deployment of the
 ![Secrets](/components/data-apps/data_apps-secrets.png)
 
 ## Loading Data from Storage
-To load data from the storage of a Keboola Connection project into the app, use the [input mapping](https://help.keboola.com/transformations/mappings/#input-mapping) section.
+To load data from the storage of a Keboola project into the app, use the [input mapping](https://help.keboola.com/transformations/mappings/#input-mapping) section.
 Just select your table in the input mapping section and navigate to that by /data/in/table/your_data.csv or /data/in/files/fileID_FileName.* in your code.
 Note that, while in BETA, the app needs to be redeployed to fetch up-to-date data.
-Or you can use [Keboola Connection Storage Python Client](https://github.com/keboola/sapi-python-client) in the app to load the data as needed.
+Or you can use [Keboola Storage Python Client](https://github.com/keboola/sapi-python-client) in the app to load the data as needed.
 See the [examples](#Examples) below for usage of the Keboola Storage Python Client.
 
 ## Writing Back to Storage
-For writing data back to Keboola Connection Project Storage, use our [Keboola Connection Storage Python Client](https://github.com/keboola/sapi-python-client).
+For writing data back to Keboola Project Storage, use our [Keboola Storage Python Client](https://github.com/keboola/sapi-python-client).
 See the [examples](#Examples) below for usage of the Keboola Storage Python Client.
 
 ## Deployment and App Management
@@ -226,7 +226,7 @@ This data app, along with the complete workflow, can be implemented using the AI
 ### Interactive Keboola Sheets
 Author: Petr Huňka
 
-Simplify data editing and management within your company. The data app eliminates the need to export data to external tools, allowing business users to directly access and edit tables stored in Keboola Connection Storage.
+Simplify data editing and management within your company. The data app eliminates the need to export data to external tools, allowing business users to directly access and edit tables stored in Keboola Storage.
 - [Live app](https://sandbox.north-europe.azure.keboola.com/51814820/)
 - [Configuration](https://demo.keboola.com/app/data-apps/51359967)
 - [Documentation](https://help.keboola.com/templates/interactive-keboola-sheets/)
diff --git a/components/extractors/communication/email-attachments/index.md b/components/extractors/communication/email-attachments/index.md
index 85b2b03a7..59c1b58c0 100644
--- a/components/extractors/communication/email-attachments/index.md
+++ b/components/extractors/communication/email-attachments/index.md
@@ -8,7 +8,7 @@ redirect_from:
 * TOC
 {:toc}
 
-This extractor allows you to import data from email attachments to Keboola Connection.
+This extractor allows you to import data from email attachments to Keboola.
 It extracts data from systems generating exports only as CSV files attached to an email.
 It can also be used instead of repeated [manual imports of CSV](/tutorial/load/) files.
 
diff --git a/components/extractors/communication/index.md b/components/extractors/communication/index.md
index 94b07eedb..f4cc35a81 100644
--- a/components/extractors/communication/index.md
+++ b/components/extractors/communication/index.md
@@ -6,7 +6,7 @@ redirect_from:
 
 ---
 
-Extractors import data from external sources and integrate it to the Keboola Connection environment.
+Extractors import data from external sources and integrate it to the Keboola environment.
 The following extractors support communication systems: 
 
 - [Email Attachments](/components/extractors/communication/email-attachments/) 
diff --git a/components/extractors/communication/slack/index.md b/components/extractors/communication/slack/index.md
index cf103cc74..306de671f 100644
--- a/components/extractors/communication/slack/index.md
+++ b/components/extractors/communication/slack/index.md
@@ -9,7 +9,7 @@ redirect_from:
 {:toc}
 
 The Slack extractor uses the [Slack API](https://api.slack.com/methods) to fetch data from [Slack](https://slack.com/)
-and to bring it to Keboola Connection.
+and to bring it to Keboola.
 
 ## Create New Configuration
 [Create a new configuration](/components/#creating-component-configuration) of the **Slack** extractor.
diff --git a/components/extractors/communication/zendesk/index.md b/components/extractors/communication/zendesk/index.md
index 2d68b6667..a119cdd05 100644
--- a/components/extractors/communication/zendesk/index.md
+++ b/components/extractors/communication/zendesk/index.md
@@ -25,7 +25,7 @@ Fill in a description for the new token (for example, `Keboola Zendesk Extractor
 {: .image-popup}
 ![Zendesk Token copy](/components/extractors/communication/zendesk/zendesk-2.png)
 
-When the registration is finished, take a note of the API Key and save it. You will need it when creating your extractor configuration in Keboola Connection.
+When the registration is finished, take a note of the API Key and save it. You will need it when creating your extractor configuration in Keboola.
 
 ## Configuration
 [Create a new configuration](/components/#creating-component-configuration) of the **Zendesk** extractor.
diff --git a/components/extractors/database/bigquery/index.md b/components/extractors/database/bigquery/index.md
index 3890557cb..896d9f29a 100644
--- a/components/extractors/database/bigquery/index.md
+++ b/components/extractors/database/bigquery/index.md
@@ -8,12 +8,12 @@ redirect_from:
 * TOC
 {:toc}
 
-The BigQuery extractor loads data from [BigQuery](https://cloud.google.com/bigquery/) and brings it into Keboola Connection. 
+The BigQuery extractor loads data from [BigQuery](https://cloud.google.com/bigquery/) and brings it into Keboola. 
 Running the extractor creates a background job that
 
 - executes the queries in Google BigQuery.
 - saves the results to Google Cloud Storage.
-- exports the results from Google Cloud Storage and stores them in specified tables in Keboola Connection Storage.
+- exports the results from Google Cloud Storage and stores them in specified tables in Keboola Storage.
 - removes the results from Google Cloud Storage.
 
 ***Note:** Using the Google BigQuery extractor is also described in our [Getting Started Tutorial](/tutorial/ad-hoc/#using-bigquery-extractor).*
@@ -24,7 +24,7 @@ Running the extractor creates a background job that
 To access and extract data from your BigQuery dataset, you need to set up a Google service account. Go 
 to [**Google Cloud Platform Console > IAM & admin > Service accounts**](https://console.cloud.google.com/iam-admin/serviceaccounts)
 and select the project you want the extractor to have access to. Click **Create Service Account**
-and enter a *Service account name* (e.g., `Keboola Connection BigQuery Extractor`).
+and enter a *Service account name* (e.g., `Keboola BigQuery extractor`).
 
 {: .image-popup}
 ![Screenshot - Create service account](/components/extractors/database/bigquery/googlecloud-1.png)
diff --git a/components/extractors/database/filemaker/index.md b/components/extractors/database/filemaker/index.md
index f3693b3f7..d9ddde2e0 100644
--- a/components/extractors/database/filemaker/index.md
+++ b/components/extractors/database/filemaker/index.md
@@ -78,7 +78,7 @@ Output
 ======
 
 **NOTE** The columns prefixed `_` are prefixed with hsh prefix in the result table. 
-This is because the Keboola Connection Storage does not allow to store columns prefixed with underscore. So the column `_Timestamp` will be stored as `hsh_Timestamp` in the resulting table.
+This is because the Keboola Storage does not allow to store columns prefixed with underscore. So the column `_Timestamp` will be stored as `hsh_Timestamp` in the resulting table.
 
 
 ### Metadata Tables
diff --git a/components/extractors/database/index.md b/components/extractors/database/index.md
index 88e4021c4..c17bc5def 100644
--- a/components/extractors/database/index.md
+++ b/components/extractors/database/index.md
@@ -9,7 +9,7 @@ redirect_from:
 * TOC
 {:toc}
 
-Extractors import data from external sources and integrate it to the Keboola Connection environment.
+Extractors import data from external sources and integrate it to the Keboola environment.
 
 ## SQL Databases
 
diff --git a/components/extractors/database/sqldb/index.md b/components/extractors/database/sqldb/index.md
index 6dadd490b..0a564a2a2 100644
--- a/components/extractors/database/sqldb/index.md
+++ b/components/extractors/database/sqldb/index.md
@@ -80,7 +80,7 @@ Avoid doing complex joins and aggregations in SQL queries.
 Remember that these queries are executed on the database server you are extracting from.
 This database system might not be designed or optimized for complex SELECT queries.
 Complex queries may result in timeouts, or they might produce unnecessary loads on your internal systems.
-Instead, import raw data, and then use Keboola Connection tools to give it the shape you want.
+Instead, import raw data, and then use Keboola tools to give it the shape you want.
 
 ## Server Specific Notes
 
diff --git a/components/extractors/erp/index.md b/components/extractors/erp/index.md
index 45985f323..dbbb01ece 100644
--- a/components/extractors/erp/index.md
+++ b/components/extractors/erp/index.md
@@ -3,8 +3,8 @@ title: ERP
 permalink: /components/extractors/erp/
 ---
 
-Extractors import data from external sources and integrate it to the Keboola Connection environment.
-Keboola Connection provides the following ERP extractors:
+Extractors import data from external sources and integrate it to the Keboola environment.
+Keboola provides the following ERP extractors:
 
 - [K2](/components/extractors/erp/k2/)
 - [NetSuite](/components/extractors/erp/netsuite/)
diff --git a/components/extractors/erp/netsuite/index.md b/components/extractors/erp/netsuite/index.md
index e37fb727f..64fb05550 100644
--- a/components/extractors/erp/netsuite/index.md
+++ b/components/extractors/erp/netsuite/index.md
@@ -8,7 +8,7 @@ permalink: /components/extractors/erp/netsuite/
 
 The data source for NetSuite enables users to download data from NetSuite using
 the [SuiteAnalytics Connect Service](https://docs.oracle.com/en/cloud/saas/netsuite/ns-online-help/chapter_3963845427.html). 
-Leveraging the ODBC driver, this extractor provides the same capabilities as other Keboola Connection database extractors, including incremental fetching.
+Leveraging the ODBC driver, this extractor provides the same capabilities as other Keboola database extractors, including incremental fetching.
 
 ## Prerequisites
 
diff --git a/components/extractors/marketing-sales/bing-ads/index.md b/components/extractors/marketing-sales/bing-ads/index.md
index 118697fcf..2fcc62523 100644
--- a/components/extractors/marketing-sales/bing-ads/index.md
+++ b/components/extractors/marketing-sales/bing-ads/index.md
@@ -26,7 +26,7 @@ extractor.
 
 ### Global Configuration
 
-First log into your account using the **Authorize Account** button in the Keboola Connection interface.
+First log into your account using the **Authorize Account** button in the Keboola interface.
 
 {: .image-popup}
 ![OAuth Authorization](/components/extractors/marketing-sales/bing-ads/config_oauth.png)
diff --git a/components/extractors/marketing-sales/criteo/index.md b/components/extractors/marketing-sales/criteo/index.md
index bcfbfd13b..c672592d3 100644
--- a/components/extractors/marketing-sales/criteo/index.md
+++ b/components/extractors/marketing-sales/criteo/index.md
@@ -42,7 +42,7 @@ to create a new report to download.
 ## Row Configuration
 
 In the configuration parameters, do the following:
-- Fill in the output name. It will be the name of the output table in Keboola Connection.
+- Fill in the output name. It will be the name of the output table in Keboola.
 - Fill in the [dimension](https://developers.criteo.com/marketing-solutions/docs/dimensions) for the report.
 - Fill in the [metrics](https://developers.criteo.com/marketing-solutions/docs/metrics) for the report.
 - Fill in the [currency](https://developers.criteo.com/marketing-solutions/docs/currencies-supported) of the report.
diff --git a/components/extractors/marketing-sales/gooddata-reports/index.md b/components/extractors/marketing-sales/gooddata-reports/index.md
index 010df7f3a..e83f75404 100644
--- a/components/extractors/marketing-sales/gooddata-reports/index.md
+++ b/components/extractors/marketing-sales/gooddata-reports/index.md
@@ -9,7 +9,7 @@ redirect_from:
 {:toc}
 
 The GoodData Reports extractor uses the [GoodData API](https://help.gooddata.com/display/API/API+Reference#/reference/dashboards-and-reporting/export-a-large-report/export-a-raw-report) to import
-reports from the [GoodData](https://www.gooddata.com/) business intelligence platform and stores the data in Keboola Connection Storage.
+reports from the [GoodData](https://www.gooddata.com/) business intelligence platform and stores the data in Keboola Storage.
 
 ## Configuration
 [Create a new configuration](/components/#creating-component-configuration) of the **GoodData Reports** extractor.
@@ -49,4 +49,4 @@ Copy the project ID from the writer to the extractor:
 ![Screenshot - Provisioned GoodData Project Id](/components/extractors/marketing-sales/gooddata-reports/gooddata-reports-4.png)
 
 When finished, remember to **Save** the configuration before you run the extraction. The extractor will download the report contents as a
-CSV file and store it as a table in Keboola Connection Storage.
+CSV file and store it as a table in Keboola Storage.
diff --git a/components/extractors/marketing-sales/google-analytics/index.md b/components/extractors/marketing-sales/google-analytics/index.md
index 9600c46e6..b2e022579 100644
--- a/components/extractors/marketing-sales/google-analytics/index.md
+++ b/components/extractors/marketing-sales/google-analytics/index.md
@@ -9,7 +9,7 @@ redirect_from:
 * TOC
 {:toc}
 
-This extractor allows you to integrate your Google Analytics data into the Keboola Connection environment.
+This extractor allows you to integrate your Google Analytics data into the Keboola environment.
 To do that, you will need a [Google Analytics account](https://analytics.google.com/analytics/web/).
 
 **Note:** This component supports both Google Analytics 4 (GA4) and old Universal Analytics (UA).
diff --git a/components/extractors/marketing-sales/index.md b/components/extractors/marketing-sales/index.md
index 7e7e2808e..9111aecbf 100644
--- a/components/extractors/marketing-sales/index.md
+++ b/components/extractors/marketing-sales/index.md
@@ -6,8 +6,8 @@ redirect_from:
 
 ---
 
-Extractors import data from external sources and integrate it to the Keboola Connection environment.
-Keboola Connection provides the following marketing and sales extractors:
+Extractors import data from external sources and integrate it to the Keboola environment.
+Keboola provides the following marketing and sales extractors:
 
 - [Adform DSP Reports](/components/extractors/marketing-sales/adform-dsp-reports/)
 - [Babelforce](/components/extractors/marketing-sales/babelforce/)
diff --git a/components/extractors/other/aws-cur-reports/index.md b/components/extractors/other/aws-cur-reports/index.md
index c9f6fb019..13ca5db2f 100644
--- a/components/extractors/other/aws-cur-reports/index.md
+++ b/components/extractors/other/aws-cur-reports/index.md
@@ -66,12 +66,12 @@ This way you can import new data, e.g., from today, without deleting the data im
 
 The output schema is described in our [official documentation](https://docs.aws.amazon.com/cur/latest/userguide/data-dictionary.html).
 
-Keep in mind that **the result column names are modified to match the KBC Storage column name requirements**:
+Keep in mind that **the result column names are modified to match the Keboola Storage column name requirements**:
 
 - Categories are separated by `__`. E.g.,`bill/BillingPeriodEndDate` is converted to `bill__billingPeriodEndDate`.
 - Any characters that are not alphanumeric or `_` underscores are replaced by underscore. 
 E.g., `resourceTags/user:owner` is converted to `resourceTags__user_owner`
-- The KBC Storage is case insensitive, so the above may lead to duplicate names. In such case, the names are deduplicated by adding an index. 
+- The Keboola Storage is case insensitive, so the above may lead to duplicate names. In such case, the names are deduplicated by adding an index. 
 E.g., `resourceTags/user:name` and `resourceTags/user:Name` lead to `resourceTags__user_Name` and `resourcetags__user_name_1` 
 columns respectively.
 
diff --git a/components/extractors/other/github/index.md b/components/extractors/other/github/index.md
index 5d4c2ee9e..3ed26ef1e 100644
--- a/components/extractors/other/github/index.md
+++ b/components/extractors/other/github/index.md
@@ -9,7 +9,7 @@ redirect_from:
 {:toc}
 
 The GitHub extractor uses the [GitHub API](https://developer.github.com/v3/) to import data from [GitHub](https://github.com/)
-to Keboola Connection.
+to Keboola.
 
 ## Configuration
 [Create a new configuration](/components/#creating-component-configuration) of the **GitHub** extractor.
diff --git a/components/extractors/other/index.md b/components/extractors/other/index.md
index a10316c24..490cb083c 100644
--- a/components/extractors/other/index.md
+++ b/components/extractors/other/index.md
@@ -5,7 +5,7 @@ redirect_from:
     - /extractors/other/
 ---
 
-Extractors import data from external sources and integrate it to the Keboola Connection environment.
+Extractors import data from external sources and integrate it to the Keboola environment.
 Apart from extractors for social networks, communication, storage, and marketing and sales, there are
 extractors that do not fall into any of the above mentioned categories:
 
diff --git a/components/extractors/other/pingdom/index.md b/components/extractors/other/pingdom/index.md
index 71b86e44a..ae06eb719 100644
--- a/components/extractors/other/pingdom/index.md
+++ b/components/extractors/other/pingdom/index.md
@@ -30,7 +30,7 @@ Fill the required fields of the registration form.
 ![Pingdom API registration](/components/extractors/other/pingdom/04-pingdom-api-form.png)
 
 When registration is finished, copy the Application Key and save it. You will need it when creating your extractor configuration 
-in Keboola Connection.
+in Keboola.
 
 {: .image-popup}
 ![Pingdom API key](/components/extractors/other/pingdom/05-pingdom-api-key.png)
diff --git a/components/extractors/other/telemetry-data/telemetry-data.md b/components/extractors/other/telemetry-data/telemetry-data.md
index 800c64829..1df2f3604 100644
--- a/components/extractors/other/telemetry-data/telemetry-data.md
+++ b/components/extractors/other/telemetry-data/telemetry-data.md
@@ -10,12 +10,12 @@ redirect_from:
 {:toc}
 
 The Telemetry Data extractor allows you to retrieve data about your project or your entire [organization](/management/organization/). 
-It helps you monitor activities and usage in your Keboola Connection projects. It also aids Keboola in calculating your project's consumption.
+It helps you monitor activities and usage in your Keboola projects. It also aids Keboola in calculating your project's consumption.
 
 ## Configuration
 To configure the extractor, select one of the following modes:
  
-1. [**Project mode**](#project-mode-tables): Extracts data only from a selected Keboola Connection project.
+1. [**Project mode**](#project-mode-tables): Extracts data only from a selected Keboola project.
 2. [**Organization mode**](#organization-mode-tables): Extracts data from all projects within your organizations. The data is compiled into a single target project. This must be set up by Keboola. After configuring the extractor, contact your Keboola Account Manager or our [support team](/management/support/).
 3. [**Activity Center mode**](#activity-center-mode-tables): Extracts data from all projects within your organizations. The data is compiled into a single target project. This mode is available to customers who have the **Activity Center add-on** in their contract and also must be set up by Keboola. After configuring the extractor, contact your Keboola Account Manager or our [support team](/management/support/).
 
@@ -37,7 +37,7 @@ This table shows snapshots of buckets in Storage.
 | **Column** | **Description** | **Example** | 
 |---|---|---|
 | `bucket_id` (PK) | Identifier for the storage bucket | `1147628` |
-| `kbc_project_id` (PK) | Foreign key to a KBC project | `866_kbc-eu-central-1` |
+| `kbc_project_id` (PK) | Foreign key to a Keboola project | `866_kbc-eu-central-1` |
 | `snapshot_date` (PK) | Date of the data snapshot | `2020-06-30` |
 | `stage` | Storage stage of the bucket | `in` |
 | `bucket` | Name of the bucket | `c-instagram` |
@@ -52,8 +52,8 @@ This table shows main and development [branches](/components/branches/) in the p
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_branch_id` (PK) | KBC Branch identifier | `3419_kbc-eu-central-1` |
-| `kbc_project_id` | Foreign key to a KBC project | `866_kbc-eu-central-1` |
+| `kbc_branch_id` (PK) | Keboola Branch identifier | `3419_kbc-eu-central-1` |
+| `kbc_project_id` | Foreign key to a Keboola project | `866_kbc-eu-central-1` |
 | `kbc_branch` | Name of the branch | `My dev branch` |
 | `kbc_branch_created_at` | Datetime of the branch creation | `2022-05-18 06:13:45` |
 | `is_default` | Determines if the branch is the main (default) branch (`true`, `false`) | `false` |
@@ -71,8 +71,8 @@ This table lists the [configurations of components](/components/#creating-compon
 | **Column** | **Description** | **Example** |  
 |---|---|---|
 | `kbc_component_configuration_id` (PK) | Identifier for the component configuration | `580_kbc-us-east-1_keboola.python- transformation-v2-610931033` |
-| `kbc_component_configuration_url` | URL of the configuration in the KBC project | `https://connection.keboola.com/ admin/projects/580/transformations/ bucket/152336525` |
-| `kbc_project_id` | Foreign key to the KBC project | `580_kbc-us-east-1` |
+| `kbc_component_configuration_url` | URL of the configuration in the Keboola project | `https://connection.keboola.com/ admin/projects/580/transformations/ bucket/152336525` |
+| `kbc_project_id` | Foreign key to the Keboola project | `580_kbc-us-east-1` |
 | `kbc_component_id` | Identifier of the component | `keboola.python-transformation-v2` |
 | `kbc_component` | Name of the component | `Generic` |
 | `configuration_id_num` | Numeric identifier of the configuration | `610931033` |
@@ -92,7 +92,7 @@ of the component configuration.
 | **Column** | **Description** | **Example** | 
 |---|---|---|
 | `kbc_component_configuration_id` (PK) | Identifier for the component configuration | `6610_kbc-us-east-1_orchestrator-583757303` |
-| `kbc_branch_id` (PK) | Foreign key to the KBC branch | `3419_kbc-eu-central-1` |
+| `kbc_branch_id` (PK) | Foreign key to the Keboola branch | `3419_kbc-eu-central-1` |
 | `configuration_updated_at` | Datetime when the configuration was updated | `2020-03-28 20:29:25` |
 | `change_description` | Description of what changed in the configuration | `Update orchestration notifications` |
 | `configuration_version` (PK) | Version of the configuration | `3` |
@@ -109,8 +109,8 @@ This table lists rows of the [configurations for the components](/components/#cr
 | **Column** | **Description** | **Example** |  
 |---|---|---|
 | `kbc_component_configuration_row_id` (PK) | Component configuration row identifier | `8765_kbc-us-east-1_keboola.ex-db-mysql_844500148_844500150` |
-| `kbc_component_configuration_id` | Foreign key to the KBC component configuration | `8765_kbc-us-east-1_keboola.ex-db-mysql_844500148` |
-| `kbc_project_id` | Foreign key to the KBC project | `8765_kbc-us-east-1` |
+| `kbc_component_configuration_id` | Foreign key to the Keboola component configuration | `8765_kbc-us-east-1_keboola.ex-db-mysql_844500148` |
+| `kbc_project_id` | Foreign key to the Keboola project | `8765_kbc-us-east-1` |
 | `kbc_component_id` | Identifier of the component | `keboola.ex-db-mysql_kbc-us-east-1` |
 | `configuration_row_id_num` | Numeric identifier of the configuration row | `844500150` |
 | `kbc_component_configuration_row` | Name of the configuration row | `test_view` |
@@ -131,7 +131,7 @@ and their consumption metrics.
 |---|---|---|
 | `kbc_data_science_sandbox_resume_id` (PK) | Identifier of the sandbox active window (between starting and pausing the sandbox) | `10910_kbc-eu-central-1_8c9e68ac-3a40-4aea-a62c-34ef37d12a5a` |
 | `kbc_data_science_sandbox_id` | Data science sandbox identifier | `10910_kbc-eu-central-1` |
-| `kbc_project_id` | Foreign key to the KBC Project | `1075-eu-central-1` |
+| `kbc_project_id` | Foreign key to the Keboola Project | `1075-eu-central-1` |
 | `date` (PK) | Date for which the runtime hours and time credits are calculated | `2020-11-27` |
 | `created_at` | Datetime of sandbox creation | `2020-11-27 11:22:08` |
 | `expiration_at` | Sandbox expiration datetime | `2020-12-02 11:22:08` |
@@ -148,14 +148,14 @@ and their consumption metrics.
 
 
 ### kbc_job
-This table lists Keboola Connection [jobs](/management/jobs/) 
+This table lists Keboola [jobs](/management/jobs/) 
 (e.g., an extractor job or a transformation).
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_job_id` (PK) | KBC job identifier | `117644387_kbc-eu-central-1` |
+| `kbc_job_id` (PK) | Keboola job identifier | `117644387_kbc-eu-central-1` |
 | `kbc_component_configuration_id` | Foreign key to the component configuration | `410_kbc-eu-central-1_keboola.wr-google-sheets-259642632` |
-| `kbc_branch_id` | Foreign key to the KBC branch | `3419_kbc-eu-central-1` |
+| `kbc_branch_id` | Foreign key to the Keboola branch | `3419_kbc-eu-central-1` |
 | `kbc_component_id` | Identifier of the component related to the job | `keboola.wr-google-sheets` |
 | `transformation_type` | Type of the transformation, if applicable. Possible values: <br> `OpenRefine`, `R`, `Python`, `SQL`, `Unknown`: backend wasn't recognized or a new backend not yet introduced, `None` – not a transformation job or encapsulating an apparent transformation job | `None` |
 | `job_run_id` | Run ID of the job – multiple jobs can run under the same Run ID | `117643429.117644388` |
@@ -181,18 +181,18 @@ This table lists Keboola Connection [jobs](/management/jobs/)
 
 
 ### kbc_project
-This table shows data about Keboola Connection [projects](/management/project/) 
+This table shows data about Keboola [projects](/management/project/) 
 belonging to an organization.
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_project_id` (PK) | KBC project identifier | `1944_kbc-us-east-1` |
+| `kbc_project_id` (PK) | Keboola project identifier | `1944_kbc-us-east-1` |
 | `kbc_project_id_num` | Project numeric identifier | `1944` |
 | `kbc_project` | Name of the project | `Sales Workshop - Kuba` |
 | `kbc_project_region` | Region of the project | `us-east-1` |
 | `kbc_project_cloud` | Cloud provider of the project | `aws` |
 | `kbc_project_url` | URL of the project | `https://connection.keboola.com/admin/projects/1944` |
-| `kbc_organization_id` | Foreign key to the KBC organization | `116_kbc-us-east-1` |
+| `kbc_organization_id` | Foreign key to the Keboola organization | `116_kbc-us-east-1` |
 | `kbc_project_created` | Datetime when the project was created | `2017-09-04 14:26:40` |
 | `kbc_project_deleted` | Datetime when the project was deleted | `2017-10-19 14:26:49` |
 | `kbc_project_is_deleted` | Determines if the project is deleted. | `true` |
@@ -206,7 +206,7 @@ This table shows snapshots of projects to track changes in their size.
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_project_id` (PK) | Foreign key to the KBC project | `1105_kbc-eu-central-1` |
+| `kbc_project_id` (PK) | Foreign key to the Keboola project | `1105_kbc-eu-central-1` |
 | `snapshot_date` (PK) | Date of the data snapshot | `2020-06-26` |
 | `rows` | Number of rows in the project at the time of the snapshot | `28137568882` |
 | `bytes` | Data size of the project in bytes at the time of the snapshot | `1071491549696` |
@@ -218,7 +218,7 @@ The snapshots are taken multiple times a day.
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_project_id` (PK) | Foreign key to the KBC project | `409_com-keboola-azure-north-europe` |
+| `kbc_project_id` (PK) | Foreign key to the Keboola project | `409_com-keboola-azure-north-europe` |
 | `snapshot_time` (PK) | Datetime of the snapshot | `2020-06-29 12:55:16` |
 | `user_id` (PK) | Identifier of the user | `2195` |
 | `valid_from` | Datetime from which the user has been a member of the project | `2020-03-28 11:19:47` |
@@ -231,7 +231,7 @@ This table shows information about queries using Snowflake, including transforma
 
 | **Column** | **Description** | **Example** |
 |---|---|---|
-| `kbc_project_id` (PK) | Foreign key to the KBC project | `458_kbc-eu-central-1` |
+| `kbc_project_id` (PK) | Foreign key to the Keboola project | `458_kbc-eu-central-1` |
 | `snowflake_job_start_at` (PK) | Datetime hour the jobs started (Snowflake jobs/queries are aggregated per hour) | `2019-08-19 06:00:00` |
 | `dwh_size` (PK) | Size of the DWH used | `Medium` |
 | `snowflake_dwh` (PK) | DWH name | `KEBOOLA_PROD` |
@@ -252,16 +252,16 @@ This table shows [Storage table](/storage/tables/) snapshots.
 | **Column** | **Description** | **Example** | 
 |---|---|---|
 | `table_id` (PK) | Storage table identifier | `in.c-GDU_Management.status` |
-| `kbc_project_id` (PK) | Foreign key to the KBC project | `239_kbc-eu-central-1` |
+| `kbc_project_id` (PK) | Foreign key to the Keboola project | `239_kbc-eu-central-1` |
 | `snapshot_date` (PK) | Date of the data snapshot | `2020-07-02` |
-| `bucket_id` | Foreign key to the KBC bucket | `1695` |
+| `bucket_id` | Foreign key to the Keboola bucket | `1695` |
 | `created` | Datetime when the table was created | `2020-07-02 08:27:03` |
 | `last_import` | Datetime of the last import to the table | `2020-07-02 08:33:39` |
 | `table_name` | Name of the Storage table | `status` |
 | `primary_key` | Primary key of the Storage table | `id` |
 | `is_alias` | Indicates if the table is an alias (`true`, `false`) | `true` |
 | `alias_column_sync` | Determines if the alias table should sync all the columns from the source table (`true`, `false`). | `true` |
-| `source_project_id` | Foreign key to the KBC project the alias is coming from | `20-eu-central-1` |
+| `source_project_id` | Foreign key to the Keboola project the alias is coming from | `20-eu-central-1` |
 | `source_table_id` | Identifier of the source table | `out.c-GDUserManagement.status` |
 | `alias_filter_column` | Column used to filter rows of the source table | `USER_ID` |
 | `alias_filter_operator` | Type of the alias filter operator. Possible values: <br> `eq` -- SQL “IN” <br> `ne` -- SQL “NOT IN” | `eq` |
@@ -295,13 +295,13 @@ You need data for all projects.*
 | **Column** | **Description** | **Example** | 
 |---|---|---|
 | `metrics_values_id` (PK) | Identifier of the daily value of the usage metric (combination of the project ID, usage metric ID, metric breakdown, sandbox flag, and date) | `779_kbc-eu-central-1_kbc_tb_KBC TB_false_2020-07-14` |
-| `kbc_project_id` | Foreign key to the KBC project | `779_kbc-eu-central-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `779_kbc-eu-central-1` |
 | `usage_metric_id` | Identifier of the usage metric. Possible values: <br> `kbc_ppu`, `kbc_tb`, `kbc_users`, `kbc_projects` | `kbc_tb` |
 | `date` | Date of the value | `2019-11-01` |
 | `usage_breakdown` | Breakdown of the usage metric (still the same limit, but a more detailed view of consumption for some metrics). For instance, PPU can be broken down into writers, applications, and transformations. | `DWH Direct Query` |
 | `is_sandbox` | Flag determining if the value is for sandbox | `true` |
 | `value` | Value of the metric (always related to the particular metric, key-value pairs) | `4.150657` |
-| `organization_value` | Organization value of the metric (used for KBC users, where we’re assigning distinct users to the single org project, so we’re not calculating users more than once when looking at organization value – a single user can be in multiple projects) | `15` |
+| `organization_value` | Organization value of the metric (used for Keboola users, where we’re assigning distinct users to the single org project, so we’re not calculating users more than once when looking at organization value – a single user can be in multiple projects) | `15` |
 | `company_value` | Similar to the organization value, but it might give a different result if the company contains more organizations | `12` |
 | `time_credits_value` | Value in time credits for metrics calculated in credits | `0.001667` |
 | `run_time_hours` | Runtime value in hours for metrics calculated based on time | `0.000278` |
@@ -310,15 +310,15 @@ You need data for all projects.*
 ### security_event
 This table lists [security events](/management/project/tokens/#token-events), 
 such as project logins or token creations. The events might be related directly to the project, its
-organization, or the Keboola Connection platform itself.
+organization, or the Keboola platform itself.
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
 | `security_event_id` (PK) | Security event identifier | `2080005325_kbc-us-east-1` | 
 | `event_created` | Datetime of the event | `2020-07-01 10:15:20` |
 | `company_id` | Identifier of the company the event belongs to | `011t00000Gs3BiAAJ` |
-| `kbc_organization_id` | Foreign key to the KBC organization (events can be related to a project, organization or the whole platform, e.g., failed logins) | `211_kbc-us-east-1` |
-| `kbc_project_id` | Foreign key to the KBC project | `5954_kbc-us-east-1` |
+| `kbc_organization_id` | Foreign key to the Keboola organization (events can be related to a project, organization or the whole platform, e.g., failed logins) | `211_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `5954_kbc-us-east-1` |
 | `admin_email` | Email of the user participating in the event | `john.doe@keboola.com` |
 | `admin_name` | Name of the user participating in the event | `Martin Matejka` |
 | `admin_ip` | IP address from which the event was triggered | `34.200.169.177` |
@@ -469,11 +469,11 @@ This table lists the limits set in contracts for comparison with actual consumpt
 | `limit_type` | Usually labeled as `contract`, but it can be `reimbursement` in case of raised limits due to platform issues | `contract` |
 
 ### kbc_organization
-This table shows data about Keboola Connection [organizations](/management/organization/).
+This table shows data about Keboola [organizations](/management/organization/).
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_organization_id` (PK) | KBC organization identifier | `225_kbc-us-east-1` |
+| `kbc_organization_id` (PK) | Keboola organization identifier | `225_kbc-us-east-1` |
 | `kbc_organization_id_num` | Numerical organization identifier | `225` |
 | `kbc_organization` | Name of the organization | `Keboola Internal` |
 | `kbc_maintainer_id` | Identifier of the Maintainer (the parent of the organization) | `12_kbc-us-east-1` |
@@ -483,7 +483,7 @@ This table shows data about Keboola Connection [organizations](/management/organ
 | `kbc_organization_deleted_at` | Datetime of deletion, if the organization was deleted | `2019-02-02 13:45:51` |
 | `kbc_organization_is_deleted` | Flag indicating if the organization is deleted (`true`, `false`) | `true` |
 | `kbc_organization_autojoin` | Flag indicating if Keboola Support can access projects in the organization without a confirmed request | `true` |
-| `kbc_organization_url` | URL of the organization in KBC | `https://connection.keboola.com/ admin/organizations/225/settings` |
+| `kbc_organization_url` | URL of the organization in Keboola | `https://connection.keboola.com/ admin/organizations/225/settings` |
 
 ### usage_metric
 This table shows metrics related to your contracts.
@@ -505,8 +505,8 @@ This table shows data about the current state of storage buckets.
 | **Column** | **Description** | **Example** | 
 |---|---|---|
 | `bucket_id` | Storage bucket identifier | `1147628` |
-| `kbc_project_id` | Foreign key to the KBC project | `866_kbc-eu-central-1` |
-| `kbc_project_bucket_id` (PK) | KBC bucket identifier | `866_kbc-eu-central-1_1147628` |
+| `kbc_project_id` | Foreign key to the Keboola project | `866_kbc-eu-central-1` |
+| `kbc_project_bucket_id` (PK) | Keboola bucket identifier | `866_kbc-eu-central-1_1147628` |
 | `stage` | Storage stage of the bucket | `in` |
 | `bucket` | Name of the bucket | `c-instagram` |
 | `rows` | Number of rows in the bucket as of the date of the snapshot | `4714` |
@@ -523,9 +523,9 @@ This table shows data about the current state of storage columns.
 | **Column** | **Description** | **Example** | 
 |---|---|---|
 | `column_id` | Storage column identifier | `in.c-in_sh_kbc_internal.kbc_schedule.kbc_token_id` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
-| `kbc_project_column_id` (PK) | KBC column identifier | `7880_kbc-us-east-1_in.c-in_sh_kbc_internal.kbc_schedule.kbc_token_id` |
-| `kbc_project_table_id` | Foregin key to the KBC table | `7880_kbc-us-east-1_in.c-in_sh_kbc_internal.kbc_schedule` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
+| `kbc_project_column_id` (PK) | Keboola column identifier | `7880_kbc-us-east-1_in.c-in_sh_kbc_internal.kbc_schedule.kbc_token_id` |
+| `kbc_project_table_id` | Foregin key to the Keboola table | `7880_kbc-us-east-1_in.c-in_sh_kbc_internal.kbc_schedule` |
 | `column_name` | Name of the column | `kbc_token_id` |
 | `sort` | Order of the column in the table | `11` |
 
@@ -536,9 +536,9 @@ This table shows data about columns' metadata.
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_column_metadata_id` (PK) | KBC column metadata identifier | `1713681942_kbc-us-east-1` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
-| `kbc_project_column_id` | Foreign key to the KBC column | `7880_kbc-us-east-1_out.c-kbc_public_telemetry.kbc_job.kbc_token_id` |
+| `kbc_column_metadata_id` (PK) | Keboola column metadata identifier | `1713681942_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
+| `kbc_project_column_id` | Foreign key to the Keboola column | `7880_kbc-us-east-1_out.c-kbc_public_telemetry.kbc_job.kbc_token_id` |
 | `column_name` | Name of the column | `kbc_token_id` |
 | `table_id` | Identifier of the storage table | `out.c-kbc_public_telemetry.kbc_job` |
 | `composite_id` | Folder structure identifier | `799945/storage/kbc_job/kbc_token_id` |
@@ -552,9 +552,9 @@ This table shows data about particular phases of flows.
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_flow_phase_id` (PK) | KBC flow phase identifier | `7880_kbc-us-east-1_keboola.orchestrator_884004674_9` |
+| `kbc_flow_phase_id` (PK) | Keboola flow phase identifier | `7880_kbc-us-east-1_keboola.orchestrator_884004674_9` |
 | `kbc_component_configuration_id` | Foreign key to the flow component configuration | `7880_kbc-us-east-1_keboola.orchestrator_884004674` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
 | `phase_id` | Identifier of the phase | `9` |
 | `phase_name` | Name of the phase | `Load` |
 | `depends_on_phase_id` | Identifiers of the phases this depends on (JSON array) | `[8]` |
@@ -566,17 +566,17 @@ This table shows data about flow tasks.
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_flow_task_id` (PK) | KBC flow task identifier | `7880_kbc-us-east-1_keboola.orchestrator_884004674_67558` |
-| `kbc_flow_phase_id` | Foreign key to KBC flow phase | `7880_kbc-us-east-1_keboola.orchestrator_884004674_9` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
+| `kbc_flow_task_id` (PK) | Keboola flow task identifier | `7880_kbc-us-east-1_keboola.orchestrator_884004674_67558` |
+| `kbc_flow_phase_id` | Foreign key to Keboola flow phase | `7880_kbc-us-east-1_keboola.orchestrator_884004674_9` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
 | `task_id` | Identifier of the task | `67558` |
 | `task_name` | Name of the task | `keboola.wr-db-snowflake-952663182` |
 | `task_enabled` | Flags if the task is enabled | `true` |
 | `continue_on_failure` | Flags if the flow should run in case of a task failure | `false` |
 | `mode` | Selected mode of the task | `run` |
-| `task_component_id_orig` | KBC component identifier | `keboola.wr-db-snowflake` |
+| `task_component_id_orig` | Keboola component identifier | `keboola.wr-db-snowflake` |
 | `task_configuration_id_num` | Numeric identifier of the task configuration | `952663182` |
-| `task_kbc_component_id` | Unique KBC component identifier | `keboola.wr-db-snowflake_kbc-us-east-1` |
+| `task_kbc_component_id` | Unique Keboola component identifier | `keboola.wr-db-snowflake_kbc-us-east-1` |
 | `task_kbc_component_configuration_id` | Foreign key to the flow component configuration | `7880_kbc-us-east-1_keboola.wr-db-snowflake_952663182` |
 
 ### kbc_job_input_table
@@ -584,10 +584,10 @@ This table shows data about all input tables of the job.
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_job_id` (PK) | KBC flow task identifier | `963416992_kbc-us-east-1` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
+| `kbc_job_id` (PK) | Keboola flow task identifier | `963416992_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
 | `table_id` | Identifier of the table | `in.c-in_sh_kbc_internal.kbc_project` |
-| `kbc_project_table_id` (PK) | Foreign key to the KBC Table | `7880_kbc-us-east-1_in.c-in_sh_kbc_internal.kbc_project` |
+| `kbc_project_table_id` (PK) | Foreign key to the Keboola Table | `7880_kbc-us-east-1_in.c-in_sh_kbc_internal.kbc_project` |
 | `table_name` | Name of the table | `kbc_project` |
 | `mappings` | Number of times the table was used in the job input (i.e., one table can be used multiple times in the input mapping of the transformation) | `1` |
 
@@ -596,24 +596,24 @@ This table shows data about all output tables of the job.
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_job_id` (PK) | KBC flow task identifier | `909588277_kbc-us-east-1` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
+| `kbc_job_id` (PK) | Keboola flow task identifier | `909588277_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
 | `table_id` | Identifier of the table | `out.c-kbc_billing.kbc_event` |
-| `kbc_project_table_id` (PK) | Foreign key to the KBC Table | `7880_kbc-us-east-1_out.c-kbc_billing.kbc_event` |
+| `kbc_project_table_id` (PK) | Foreign key to the Keboola Table | `7880_kbc-us-east-1_out.c-kbc_billing.kbc_event` |
 | `table_name` | Name of the table | `kbc_event` |
 | `mappings` | Number of times the table was used in the job output (i.e., one table can be written multiple times to the storage in the output mapping of the transformation) | `1` |
 
 ### kbc_notification_subscription
-This table shows data subscriptions to notifications sent by Keboola Connection (mostly flow notifications).
+This table shows data subscriptions to notifications sent by Keboola (mostly flow notifications).
 
 *Note: The table is always extracted in full.*
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_notification_subscription_id` (PK) | KBC notification subscription identifier | `1083_kbc-us-east-1` |
+| `kbc_notification_subscription_id` (PK) | Keboola notification subscription identifier | `1083_kbc-us-east-1` |
 | `kbc_component_configuration_id` | Foreign key to the flow component configuration | `7880_kbc-us-east-1_keboola.orchestrator_884004674` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
-| `kbc_component_id` | Unique KBC component identifier | `keboola.orchestrator_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
+| `kbc_component_id` | Unique Keboola component identifier | `keboola.orchestrator_kbc-us-east-1` |
 | `type` | Type of the notification | `project` |
 | `created_at` | Datetime when the notification subscription was created | `2022-07-29 08:39:09` |
 | `deleted_at` | Datetime when the notification subscription was deleted | `2022-12-01 08:39:28` |
@@ -626,7 +626,7 @@ This table shows data about users in [organizations](/management/organization/).
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_organization_id` (PK) | Foreign key to the KBC organization | `141_kbc-us-east-1` |
+| `kbc_organization_id` (PK) | Foreign key to the Keboola organization | `141_kbc-us-east-1` |
 | `snapshot_time` (PK) | Date of the snapshot | `2023-07-25` |
 | `user_id` (PK) | Unique identifier of the user | `53_kbc-us-east-1` |
 | `valid_from` | Datetime from which the user is a member of the organization | `2019-11-12 14:06:02` |
@@ -641,17 +641,17 @@ This table shows data about configuration schedules.
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_schedule_id` (PK) | KBC schedule identifier | `21860_kbc-us-east-1` |
+| `kbc_schedule_id` (PK) | Keboola schedule identifier | `21860_kbc-us-east-1` |
 | `kbc_scheduler_configuration_id` | Foreign key to the scheduler component configuration | `7880_kbc-us-east-1_keboola.scheduler_884004680` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
 | `mode` | Mode of the schedule execution | `run` |
 | `tag` | Tag associated with the schedule | `mytag` |
 | `crontab` | Crontab definition of the schedule | `55 2 * * *` |
 | `crontab_timezone` | Timezone of the crontab | `UTC` |
 | `state` | Current state of the schedule | `enabled` |
 | `kbc_component_configuration_id` | Foreign key to the configuration of the scheduled component | `7880_kbc-us-east-1_keboola.orchestrator_884004679` |
-| `kbc_component_id` | Unique identifier of the scheduled KBC component | `keboola.orchestrator_kbc-us-east-1` |
-| `kbc_token_id` | Foreign key to the KBC token | `516358_kbc-us-east-1` |
+| `kbc_component_id` | Unique identifier of the scheduled Keboola component | `keboola.orchestrator_kbc-us-east-1` |
+| `kbc_token_id` | Foreign key to the Keboola token | `516358_kbc-us-east-1` |
 | `token_name` | Name of the token | `[_internal] Daily Scheduler` |
 
 ### kbc_table
@@ -661,17 +661,17 @@ This table shows data about the current state of storage [tables](/storage/table
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_project_table_id` (PK) | Unique KBC storage table identifier | `7880_kbc-us-east-1_in.c-in_sh_kbc_internal.kbc_project_user` |
+| `kbc_project_table_id` (PK) | Unique Keboola storage table identifier | `7880_kbc-us-east-1_in.c-in_sh_kbc_internal.kbc_project_user` |
 | `table_id` | Storage table identifier | `in.c-in_sh_kbc_internal.kbc_project_user` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
-| `kbc_project_bucket_id` | Foreign key to the KBC bucket | `7880_kbc-us-east-1_729486` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
+| `kbc_project_bucket_id` | Foreign key to the Keboola bucket | `7880_kbc-us-east-1_729486` |
 | `created` | Datetime when the table was created | `2020-10-07 12:29:25` |
 | `last_import` | Datetime of the last import to the table | `2023-08-17 08:00:12` |
 | `table_name` | Name of the Storage table | `kbc_project_user` |
 | `primary_key` | Primary key of the Storage table | `kbc_project_id,snapshot_time,user_id` |
 | `is_alias` | Determines if the table is an alias (`true`, `false`) | `true` |
 | `alias_column_sync` | Determines if the alias table should sync all the columns from the source table (`true`, `false`). | `true` |
-| `source_project_id` | Foreign key to the KBC project the alias is coming from | `7874_kbc-us-east-1` |
+| `source_project_id` | Foreign key to the Keboola project the alias is coming from | `7874_kbc-us-east-1` |
 | `source_table_id` | Identifier of the source table | `out.c-kbc_internal.kbc_project_user` |
 | `alias_filter_column` | Column used to filter rows of the source table | `user_id` |
 | `alias_filter_operator` | Type of the alias filter operator. Possible values: <br> `eq` -- SQL “IN” <br> `ne` -- SQL “NOT IN” | `eq` |
@@ -684,17 +684,17 @@ This table shows data about events of the storage [tables](/storage/tables/).
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_table_event_id` (PK) | Unique KBC table event identifier | `7103338092_kbc-us-east-1` |
+| `kbc_table_event_id` (PK) | Unique Keboola table event identifier | `7103338092_kbc-us-east-1` |
 | `table_id` | Storage table identifier | `in.c-in_sh_kbc_internal.kbc_flow_task` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
-| `kbc_project_table_id` | Foreign key to the KBC table | `7880_kbc-us-east-1_in.c-in_sh_kbc_internal.kbc_flow_task` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
+| `kbc_project_table_id` | Foreign key to the Keboola table | `7880_kbc-us-east-1_in.c-in_sh_kbc_internal.kbc_flow_task` |
 | `event_created_at` | Datetime the table was created | `2023-06-14 00:13:23` |
 | `event` | Table event which occurred | `storage.tableImportDone` |
 | `event_type` | Type of the event | `success` |
 | `message` | Message describing the event | `Imported table in.c-in_sh_kbc_internal.kbc_flow_task` |
 | `params` | Parameters of the event (JSON object) | `{"importId":"985123712","incremental":true,"source":{"dataObject":"out_kbc_flow_task","type":"workspace","tableName":"out_kbc_flow_task","workspaceId":"985122240"}}` |
 | `results` | Results of the event (JSON object). | `{"rowsCount":"272800","sizeBytes":15412736}` |
-| `kbc_token_id` | Foreign key to the KBC token | `516356_kbc-us-east-1` |
+| `kbc_token_id` | Foreign key to the Keboola token | `516356_kbc-us-east-1` |
 | `token_name` | Name of the token | `orchestration trigger` |
 
 ### kbc_table_metadata
@@ -704,9 +704,9 @@ This table shows data about metadata of the storage [tables](/storage/tables/).
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_table_metadata_id` (PK) | Unique KBC table metadata identifier | `1709268888_kbc-us-east-1` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
-| `kbc_project_table_id` | Foreign key to the KBC table | `7880_kbc-us-east-1_out.c-kbc_billing.daily_credit_changes` |
+| `kbc_table_metadata_id` (PK) | Unique Keboola table metadata identifier | `1709268888_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
+| `kbc_project_table_id` | Foreign key to the Keboola table | `7880_kbc-us-east-1_out.c-kbc_billing.daily_credit_changes` |
 | `composite_id` | Folder structure identifier | `729487/storage/daily_credit_changes` |
 | `key` | Metadata key | `KBC.name` |
 | `value` | Metadata value | `out_daily_credit_changes` |
@@ -718,8 +718,8 @@ This table shows data about the storage [tokens](/management/project/tokens/).
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_token_id` (PK) | Unique KBC token identifier | `516357_kbc-us-east-1` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
+| `kbc_token_id` (PK) | Unique Keboola token identifier | `516357_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
 | `description` | Name of the token | `[_internal] Main Scheduler` |
 | `created` | Datetime when the token was created | `2022-07-29 08:39:08` |
 | `expires` | Datetime when the token expires | `2024-07-29 08:39:08` |
@@ -732,7 +732,7 @@ This table shows data about the storage [tokens](/management/project/tokens/).
 | `component_access` | Defines if the token has access to only a specific component | `orchestrator` |
 | `is_master_token` | Defines is the token is a master (generally user's personal token) | `false` |
 | `daily_capacity` | Daily operations capacity of the token (currently not used by the backend) | `5` |
-| `created_by_token_id` | Foreign key to the creator KBC token | `287689_kbc-us-east-1` |
+| `created_by_token_id` | Foreign key to the creator Keboola token | `287689_kbc-us-east-1` |
 | `created_by_token_name` | Name of the creator token | `john.doe@keboola.com` |
 
 ### kbc_token_event
@@ -740,14 +740,14 @@ This table shows data about events of the storage [tokens](/management/project/t
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_token_event_id` (PK) | Unique KBC token event identifier | `7104199256_kbc-us-east-1` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
+| `kbc_token_event_id` (PK) | Unique Keboola token event identifier | `7104199256_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
 | `event_created_at` | Datetime when the table was created | `2023-06-14 06:03:10` |
 | `event` | Token event which occurred | `storage.tokenCreated` |
 | `event_type` | Type of the event | `info` |
-| `target_kbc_token_id` | Foreign key to the KBC token related to the event | `593967_kbc-us-east-1` |
-| `target_kbc_token_name` | Name of the KBC token related to the event | `[_internal] Scheduler for 985200312 Scheduler` |
-| `kbc_token_id` | Foreign key to the KBC token creating the event | `287689_kbc-us-east-1` |
+| `target_kbc_token_id` | Foreign key to the Keboola token related to the event | `593967_kbc-us-east-1` |
+| `target_kbc_token_name` | Name of the Keboola token related to the event | `[_internal] Scheduler for 985200312 Scheduler` |
+| `kbc_token_id` | Foreign key to the Keboola token creating the event | `287689_kbc-us-east-1` |
 | `token_name` | Name of the token creating the event | `john.doe@keboola.com` |
 
 ### kbc_transformation_code
@@ -757,9 +757,9 @@ This table shows data about codes of [transformations](/transformations/).
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_transformation_code_id` (PK) | Unique KBC transformation code identifier | `7880_kbc-us-east-1_keboola.snowflake-transformation_867148197_Product Stickiness` |
+| `kbc_transformation_code_id` (PK) | Unique Keboola transformation code identifier | `7880_kbc-us-east-1_keboola.snowflake-transformation_867148197_Product Stickiness` |
 | `kbc_component_configuration_id` | Foreign key to the transformation component configuration | `7880_kbc-us-east-1_keboola.snowflake-transformation_867148197` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
 | `code_name` | Name of the transformation code | `Product Stickiness` |
 | `code_script` | Script in the code block (JSON object) | `["--speed up queries by some deletes\nCREATE TABLE \"kbc_usage_metrics_values_filtered\"\nAS\n SELECT...` |
 
@@ -770,9 +770,9 @@ This table shows data about inputs of [transformations](/transformations/).
 
 | **Column** | **Description** | **Example** |
 |---|---|---|
-| `kbc_transformation_input_id` (PK) | Unique KBC transformation input identifier | `7880_kbc-us-east-1_keboola.snowflake-transformation_854061922_kbc_column_metadata` |
+| `kbc_transformation_input_id` (PK) | Unique Keboola transformation input identifier | `7880_kbc-us-east-1_keboola.snowflake-transformation_854061922_kbc_column_metadata` |
 | `kbc_component_configuration_id` | Foreign key to the transformation component configuration | `7880_kbc-us-east-1_keboola.snowflake-transformation_854061922` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
 | `changed_since` | Changed since data filter value | `-12 hours` |
 | `destination` | Destination table in the transformation workspace | `kbc_column_metadata` |
 | `source` | Source storage table | `out.c-kbc_public_telemetry_preprocess.kbc_column_metadata` |
@@ -787,9 +787,9 @@ This table shows data about input columns of [transformations](/transformations/
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_transformation_input_column_id` (PK) | Unique KBC transformation input column identifier | `7880_kbc-us-east-1_keboola.snowflake-transformation_854061913_kbc_job_job_storage_mb` |
+| `kbc_transformation_input_column_id` (PK) | Unique Keboola transformation input column identifier | `7880_kbc-us-east-1_keboola.snowflake-transformation_854061913_kbc_job_job_storage_mb` |
 | `kbc_transformation_input_id` | Foreign key to transformation input | `7880_kbc-us-east-1_keboola.snowflake-transformation_854061913_kbc_job` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
 | `column` | Input column name | `job_storage_mb` |
 | `column_type` | Data type of the column | `VARCHAR` |
 | `column_length` | Maximum length of the column | `16777216` |
@@ -802,9 +802,9 @@ This table shows data about outputs of the [transformations](/transformations/).
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_transformation_output_id` (PK) | Unique KBC transformation output identifier | `7880_kbc-us-east-1_keboola.snowflake-transformation_854061913_out.c-kbc_billing.kbc_data_science_sandbox` |
+| `kbc_transformation_output_id` (PK) | Unique Keboola transformation output identifier | `7880_kbc-us-east-1_keboola.snowflake-transformation_854061913_out.c-kbc_billing.kbc_data_science_sandbox` |
 | `kbc_component_configuration_id` | Foreign key to the transformation component configuration | `7880_kbc-us-east-1_keboola.snowflake-transformation_854061913` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
 | `incremental` | Flags if the data should be written to the destination table incrementally | `true` |
 | `destination` | Destination storage table | `out.c-kbc_billing.kbc_data_science_sandbox` |
 | `source` | Source table in the transformation workspace | `out_kbc_data_science_sandbox` |
@@ -820,17 +820,17 @@ This table shows data about [triggers](/components/applications/triggers/).
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_trigger_id` (PK) | Unique KBC trigger identifier | `1773_kbc-us-east-1` |
-| `kbc_project_id` | Foreign key to the KBC project | `7874_kbc-us-east-1` |
+| `kbc_trigger_id` (PK) | Unique Keboola trigger identifier | `1773_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7874_kbc-us-east-1` |
 | `kbc_component_configuration_id` | Foreign key to the component configuration which is being triggered | `7874_kbc-us-east-1_keboola.orchestrator_884004642` |
-| `kbc_component_id` | Unique identifier of KBC component of the triggered configuration | `keboola.orchestrator_kbc-us-east-1` |
+| `kbc_component_id` | Unique identifier of Keboola component of the triggered configuration | `keboola.orchestrator_kbc-us-east-1` |
 | `state` | State of the trigger | `charging` |
 | `cool_down_period_minutes` | Defines a time period before the trigger can be run again | `5` |
 | `last_run` | Datetime of the last run | `2022-08-03 11:53:19` |
 | `updated` | Datetime of the last trigger update | `2022-08-03 11:53:20` |
-| `run_with_token_id` | Foreign key to the KBC token triggering the job | `516356_kbc-us-east-1` |
+| `run_with_token_id` | Foreign key to the Keboola token triggering the job | `516356_kbc-us-east-1` |
 | `run_with_token_name` | Name of the token triggering the job | `Orchestration trigger` |
-| `created_by_token_id` | Foreign key to the KBC token creating the trigger | `516354_kbc-us-east-1` |
+| `created_by_token_id` | Foreign key to the Keboola token creating the trigger | `516354_kbc-us-east-1` |
 | `created_by_token_name` | Name of the token creating the trigger | `john.doe@keboola.com` |
 
 ### kbc_trigger_table
@@ -840,10 +840,10 @@ This table shows data about tables used to [trigger](/components/applications/tr
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_trigger_table_id` (PK) | Unique KBC trigger table identifier | `5700_kbc-us-east-1` |
-| `kbc_trigger_id` | Foreign key to the KBC trigger | `1773_kbc-us-east-1` |
-| `kbc_project_id` | Foreign key to the KBC project | `7874_kbc-us-east-1` |
-| `kbc_project_table_id` | Foreign key to KBC table triggering the job | `7874_kbc-us-east-1_out.c-kbc_billing.trigger` |
+| `kbc_trigger_table_id` (PK) | Unique Keboola trigger table identifier | `5700_kbc-us-east-1` |
+| `kbc_trigger_id` | Foreign key to the Keboola trigger | `1773_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7874_kbc-us-east-1` |
+| `kbc_project_table_id` | Foreign key to the Keboola table triggering the job | `7874_kbc-us-east-1_out.c-kbc_billing.trigger` |
 | `table_id` | Identifier of the storage table triggering the job | `out.c-kbc_billing.trigger` |
 
 ### kbc_user_activity
@@ -851,9 +851,9 @@ This table shows data about basic activity of project users (job runs and config
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_user_id` (PK) | KBC user email (activity can be tracked across stacks) | `john.doe@keboola.com` |
-| `kbc_project_id` (PK) | Foreign key to the KBC project related to the activity | `7880_kbc-us-east-1` |
-| `kbc_component_id` (PK) | Identifier of the KBC component related to the activity  | `keboola.wr-db-snowflake_kbc-us-east-1` |
+| `kbc_user_id` (PK) | Keboola user email address (activity can be tracked across stacks) | `john.doe@keboola.com` |
+| `kbc_project_id` (PK) | Foreign key to the Keboola project related to the activity | `7880_kbc-us-east-1` |
+| `kbc_component_id` (PK) | Identifier of the Keboola component related to the activity  | `keboola.wr-db-snowflake_kbc-us-east-1` |
 | `date` (PK) | Date the activity occurred | `2023-08-14` |
 | `activity_type` (PK) | Type of the activity (`Job Run`, `Configuration Update` and `None` to see that the user did nothing) | `Job Run` |
 | `activities` | Number of activities (number of run job or configuration updates) | `3` |
@@ -866,9 +866,9 @@ This table shows data about existing [workspaces](/transformations/workspace/).
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_workspace_id` (PK) | Unique KBC workspace identifier | `985088171_kbc-us-east-1` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
-| `workspace_creator` | Foreign key to the KBC table | `John Doe` |
+| `kbc_workspace_id` (PK) | Unique Keboola workspace identifier | `985088171_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
+| `workspace_creator` | Foreign key to the Keboola table | `John Doe` |
 | `workspace_created` | Datetime when the workspace was created | `2023-06-13 20:41:42.268` |
 | `workspace_type` | Backend type of the workspace | `snowflake` |
 | `workspace_active` | Flags if the workspace is active | `1` |
@@ -880,7 +880,7 @@ This table shows data about existing [workspaces](/transformations/workspace/).
 | `workspace_user` | User generated for the workspace | `SAPI_WORKSPACE_985088174` |
 | `backend_size` | Backend size of the workspace | `small` |
 | `storage_size_gb` | Size of the workspace (used for persistent workspaces) | `2` |
-| `kbc_token_id` | Foreign key to the KBC token creating the workspace | `287689_kbc-us-east-1` |
+| `kbc_token_id` | Foreign key to the Keboola token creating the workspace | `287689_kbc-us-east-1` |
 | `kbc_token_name` | Name of the token creating the workspace | `john.doe@keboola.com` |
 
 ### kbc_workspace_event
@@ -888,13 +888,13 @@ This table shows data about [workspace](/transformations/workspace/) events.
 
 | **Column** | **Description** | **Example** | 
 |---|---|---|
-| `kbc_workspace_event_id` (PK) | Unique KBC workspace event identifier | `7236030887_kbc-us-east-1` |
-| `kbc_workspace_id` | Foreign key to the KBC workspace | `985088171_kbc-us-east-1` |
-| `kbc_project_id` | Foreign key to the KBC project | `7880_kbc-us-east-1` |
+| `kbc_workspace_event_id` (PK) | Unique Keboola workspace event identifier | `7236030887_kbc-us-east-1` |
+| `kbc_workspace_id` | Foreign key to the Keboola workspace | `985088171_kbc-us-east-1` |
+| `kbc_project_id` | Foreign key to the Keboola project | `7880_kbc-us-east-1` |
 | `event_created_at` | Datetime when the workspace event was created | `2023-07-23 06:23:19` |
 | `event` | Description of the event | `storage.workspaceCreated` |
 | `event_type` | Type of the event | `info` |
-| `kbc_token_id` | Foreign key to the KBC token creating the event | `516357_kbc-us-east-1` |
+| `kbc_token_id` | Foreign key to the Keboola token creating the event | `516357_kbc-us-east-1` |
 | `kbc_token_name` | Name of the token creating the event | `[_internal] main scheduler` |
 
 ## dst_ Columns
diff --git a/components/extractors/other/time-doctor-2/index.md b/components/extractors/other/time-doctor-2/index.md
index feab075a4..37c9bc6dc 100644
--- a/components/extractors/other/time-doctor-2/index.md
+++ b/components/extractors/other/time-doctor-2/index.md
@@ -39,7 +39,7 @@ that the companies endpoint will return.
 
 ### Additional Settings
 
- - `users` - [OPT] If set to false, the component will truncate data in the existing Keboola Connection tables.
+ - `users` - [OPT] If set to false, the component will truncate data in the existing Keboola tables.
 
 {: .image-popup}
 ![Screenshot - Time Doctor 2 Configuration](/components/extractors/other/time-doctor-2/time-doctor-2.png)
diff --git a/components/extractors/other/weather-api/index.md b/components/extractors/other/weather-api/index.md
index 2cfb3fd4c..b2c5f66f7 100644
--- a/components/extractors/other/weather-api/index.md
+++ b/components/extractors/other/weather-api/index.md
@@ -8,7 +8,7 @@ permalink: /components/extractors/other/weather-api/
 
 [Weather API](https://weatherapi.com) is a free service that offers information on forecasted, real-time, and historical weather, including marine weather.
 
-This component enables users to load data from [Weather API](https://weatherapi.com) and bring it into Keboola Connection.
+This component enables users to load data from [Weather API](https://weatherapi.com) and bring it into Keboola.
 
 ## Prerequisites
 
diff --git a/components/extractors/other/yourpass/index.md b/components/extractors/other/yourpass/index.md
index 2cf040626..b7809b4f5 100644
--- a/components/extractors/other/yourpass/index.md
+++ b/components/extractors/other/yourpass/index.md
@@ -11,7 +11,7 @@ redirect_from:
 YourPass enables users to create passes for mobile wallets; e.g., for boarding passes, loyalty points, or tickets.
 
 The YourPass extractor uses the [YourPass API](https://doc.yourpass.eu/) to import data from [YourPass](https://www.yourpass.eu/)
-to Keboola Connection.
+to Keboola.
 
 ## Configuration
 [Create a new configuration](/components/#creating-component-configuration) of the **YourPasss** extractor.
diff --git a/components/extractors/social/facebook/index.md b/components/extractors/social/facebook/index.md
index 110206723..a8c8e2828 100644
--- a/components/extractors/social/facebook/index.md
+++ b/components/extractors/social/facebook/index.md
@@ -19,7 +19,7 @@ Then click **Authorize Account** to [authorize the configuration](/components/#a
 You will be asked for the `read_insights,public_profile,pages_show_list,manage_pages` [permissions](https://developers.facebook.com/docs/facebook-login/permissions).
 Optionally, you can use `Direct token insert` to specify a manually generated access token.
 
-You can always revoke the authorization by removing the *Keboola Connection Extractor* from the list
+You can always revoke the authorization by removing the *Keboola data source* from the list
 in the [Facebook apps tab](https://www.facebook.com/settings?tab=applications) (under settings).
 
 {: .image-popup}
diff --git a/components/extractors/social/index.md b/components/extractors/social/index.md
index 7a49e4919..2eb8726dc 100644
--- a/components/extractors/social/index.md
+++ b/components/extractors/social/index.md
@@ -6,7 +6,7 @@ redirect_from:
 
 ---
 
-Extractors import data from external sources and integrate it to the Keboola Connection environment.
+Extractors import data from external sources and integrate it to the Keboola environment.
 The following extractors allow access to data from social networks:
 
 - [Facebook Pages](/components/extractors/social/facebook/)
diff --git a/components/extractors/social/instagram/index.md b/components/extractors/social/instagram/index.md
index 2c2d34158..2623c14b4 100644
--- a/components/extractors/social/instagram/index.md
+++ b/components/extractors/social/instagram/index.md
@@ -26,7 +26,7 @@ with access to the Facebook page you have the Instagram Business Account connect
 You will be asked for the `instagram_basic,instagram_manage_insights,pages_show_list` [permissions](https://developers.facebook.com/docs/facebook-login/permissions).
 Optionally, you can use `Direct token insert` to specify a manually generated access token.
 
-You can always revoke the authorization by removing the **Keboola IG Extractor** from the list
+You can always revoke the authorization by removing the **Keboola IG data source** from the list
 in the [Facebook apps tab](https://www.facebook.com/settings?tab=applications) (under settings).
 
 {: .image-popup}
diff --git a/components/extractors/storage/aws-s3/index.md b/components/extractors/storage/aws-s3/index.md
index fa421b503..329ebee5d 100644
--- a/components/extractors/storage/aws-s3/index.md
+++ b/components/extractors/storage/aws-s3/index.md
@@ -9,10 +9,10 @@ redirect_from:
 {:toc}
 
 This extractor loads a single or multiple CSV files from a single or multiple AWS S3 buckets and stores them in multiple tables 
-in Keboola Connection (KBC) Storage.
+in Keboola Storage.
 
 After creating a new configuration, select the files you want to extract from AWS S3 and determine how
-you save them to KBC Storage. You also need to set up proper permissions on AWS.
+you save them to Keboola Storage. You also need to set up proper permissions on AWS.
 
 ## Configuration
 [Create a new configuration](/components/#creating-component-configuration) of the **AWS S3** extractor.
diff --git a/components/extractors/storage/azure-datalake-gen2/index.md b/components/extractors/storage/azure-datalake-gen2/index.md
index a0c6926e2..e1150cd26 100644
--- a/components/extractors/storage/azure-datalake-gen2/index.md
+++ b/components/extractors/storage/azure-datalake-gen2/index.md
@@ -9,10 +9,10 @@ redirect_from:
 {:toc}
 
 This extractor loads a single or multiple CSV files from a filesystem in Azure Datalake Gen2 and stores them in tables 
-in Keboola Connection (KBC) Storage.
+in Keboola Storage.
 
 After creating a new configuration, select the files you want to extract from Azure Datalake Gen 2 and determine how
-you save them to KBC Storage. 
+you save them to Keboola Storage. 
 
 ## Configuration
 [Create a new configuration](/components/#creating-component-configuration) of the **Azure Datalake Gen 2** extractor.
diff --git a/components/extractors/storage/ftp/index.md b/components/extractors/storage/ftp/index.md
index ca62e9819..c9bfae482 100644
--- a/components/extractors/storage/ftp/index.md
+++ b/components/extractors/storage/ftp/index.md
@@ -8,7 +8,7 @@ redirect_from:
 * TOC
 {:toc}
 
-The FTP extractor loads a single, or multiple CSV files from FTP, FTPS and SFTP servers, and stores them in Keboola Connection Storage.
+The FTP extractor loads a single, or multiple CSV files from FTP, FTPS and SFTP servers, and stores them in Keboola Storage.
 
 ## Configuration
 [Create a new configuration](/components/#creating-component-configuration) of the **FTP** extractor.
diff --git a/components/extractors/storage/index.md b/components/extractors/storage/index.md
index 5f5d75bf3..e796c54aa 100644
--- a/components/extractors/storage/index.md
+++ b/components/extractors/storage/index.md
@@ -5,7 +5,7 @@ redirect_from:
     - /extractors/storage/
 ---
 
-Extractors import data from external sources and integrate it to the Keboola Connection environment.
+Extractors import data from external sources and integrate it to the Keboola environment.
 The following extractors allow access to data from generic storage services:
 
 - [AWS S3](/components/extractors/storage/aws-s3) --- imports CSV files from multiple AWS S3 buckets into multiple tables with additional postprocessing.
@@ -13,7 +13,7 @@ The following extractors allow access to data from generic storage services:
 - [FTP](/components/extractors/storage/ftp) --- imports CSV files from the FTP, FTPS, and SFTP servers.
 - [GoogleDrive](/components/extractors/storage/google-drive/) --- imports data from Google Drive sheets (also part of the [Tutorial](/tutorial/load/googledrive/)).
 - [HTTP](/components/extractors/storage/http/) --- imports CSV files stored on HTTP or HTTPS.
-- [Keboola Connection Storage](/components/extractors/storage/storage-api/) --- loads single or multiple tables from a Keboola Connection project and stores them in a bucket in your current project; can be used where [Data Catalog](/catalog/) cannot.
+- [Keboola Connection Storage](/components/extractors/storage/storage-api/) --- loads single or multiple tables from a Keboola project and stores them in a bucket in your current project; can be used where [Data Catalog](/catalog/) cannot.
 - [OneDrive Excel Sheets](/components/extractors/storage/onedrive-excel-sheets/) --- imports data from OneDrive Excel sheets.
 - [OneDrive Files](/components/extractors/storage/onedrive-files/) --- downloads files from OneDrive.
 - And [more](https://components.keboola.com/components)
diff --git a/components/extractors/storage/storage-api/index.md b/components/extractors/storage/storage-api/index.md
index fa6ee4f01..60895d79c 100644
--- a/components/extractors/storage/storage-api/index.md
+++ b/components/extractors/storage/storage-api/index.md
@@ -8,7 +8,7 @@ redirect_from:
 * TOC
 {:toc}
 
-This extractor loads single or multiple tables from a Keboola Connection project and stores them in a bucket in your
+This extractor loads single or multiple tables from a Keboola project and stores them in a bucket in your
 current project. The component can be used in situations where [Data Catalog](/catalog/)
 cannot, e.g., when moving data between two different [organizations](/management/organization) or regions.
 
diff --git a/components/ip-addresses/index.md b/components/ip-addresses/index.md
index c4b068a8d..bd1c11f0f 100644
--- a/components/ip-addresses/index.md
+++ b/components/ip-addresses/index.md
@@ -11,13 +11,13 @@ using a firewall or AWS security groups. This applies especially to the producti
 connections should not be publicly available. For an extra layer of security, setting up an
 [SSH Tunnel](/components/extractors/database/#connecting-to-database) is also recommended.
 
-To access external systems (including your database), Keboola Connection uses the below 
-IP addresses. Please **whitelist** these IP addresses in your firewalls to allow Keboola Connection 
+To access external systems (including your database), Keboola uses the below 
+IP addresses. Please **whitelist** these IP addresses in your firewalls to allow Keboola 
 to successfully connect to your system. This applies to all components including all extractors and writers.
 
 **Important:** These IP addresses can change in the future! For your convenience, you can programmatically
 fetch and process the [list of existing IP addresses in JSON format](/components/ip-addresses/kbc-public-ip.json).
-Below are listed the available [Keboola Connection Stack endpoints](https://developers.keboola.com/overview/api/#regions-and-endpoints).
+Below are listed the available [Keboola Stack endpoints](https://developers.keboola.com/overview/api/#regions-and-endpoints).
 
 For ease of identification, our outbound IP addresses on AWS stacks (except for legacy services) now have reverse DNS records. 
 Each IP address has a unique name like `outbound-if-issue-contact-support-at-keboola-com.keboola.com`, embedding a reference for a support email. 
@@ -128,8 +128,8 @@ The JSON file contains an array of ranges (attribute `prefixes`), each of which
  - `vendor` — cloud service provider
  - `region` — cloud service region
  - `service` — Keboola application service
-   - `queue` - for Keboola Connection components
-   - `syrup` - for Keboola Connection components using legacy Queue V1
+   - `queue` - for Keboola components
+   - `syrup` - for Keboola components using legacy Queue V1
    - `email-delivery` - for outbound emails
 
 ### Sample JSON
diff --git a/components/writers/bi-tools/index.md b/components/writers/bi-tools/index.md
index 43c9d2a68..985cc8567 100644
--- a/components/writers/bi-tools/index.md
+++ b/components/writers/bi-tools/index.md
@@ -6,7 +6,7 @@ redirect_from:
 
 ---
 
-Writers export data from Keboola Connection to external systems. The following writers
+Writers export data from Keboola to external systems. The following writers
 allow to push data to various business intelligence platforms:
 
 - [GoodData](/components/writers/bi-tools/gooddata/) --- writes tables to [GoodData](https://www.gooddata.com/) and optionally also manages the GoodData project LDM.
diff --git a/components/writers/bi-tools/looker/index.md b/components/writers/bi-tools/looker/index.md
index 47a7c44b7..cabbecce4 100644
--- a/components/writers/bi-tools/looker/index.md
+++ b/components/writers/bi-tools/looker/index.md
@@ -12,14 +12,14 @@ The writer currently uses Snowflake as its backend.
 
 ## Configuration
 
-To connect Keboola Connection to your Looker account, you need API credentials from Looker administration. 
+To connect Keboola to your Looker account, you need API credentials from Looker administration. 
 The exact required steps are described in the [Looker documentation](https://docs.looker.com/reference/api-and-integration/api-auth#authentication_with_a_sdk). 
-You need `Client ID` and `Client secret` to authenticate Keboola Connection with Looker. 
+You need `Client ID` and `Client secret` to authenticate Keboola with Looker. 
 
 Create a [new **Looker writer** configuration](/components/#creating-component-configuration) in your project. 
 
 Continue by setting up a Snowflake workspace to use with Looker. You can either supply your own or use 
-a Keboola Connection generated workspace. 
+a Keboola generated workspace. 
 
 {: .image-popup}
 ![New configuration](/components/writers/bi-tools/looker/01.png)
diff --git a/components/writers/bi-tools/tableau/index.md b/components/writers/bi-tools/tableau/index.md
index 9e9d3533f..064226f6f 100644
--- a/components/writers/bi-tools/tableau/index.md
+++ b/components/writers/bi-tools/tableau/index.md
@@ -20,7 +20,7 @@ together with [Tableau Online](https://www.tableau.com/products/cloud-bi) and al
 Both approaches are interchangeable though.
 
 Our Getting Started tutorial will guide you through the process of [writing data
-from Keboola Connection to Tableau](/tutorial/write/). You can also watch our [Tableau Integration Demo](https://www.youtube.com/watch?v=FS1nndJ0vyQ) on YouTube.
+from Keboola to Tableau](/tutorial/write/). You can also watch our [Tableau Integration Demo](https://www.youtube.com/watch?v=FS1nndJ0vyQ) on YouTube.
 
 ## Configuration
 [Create a new configuration](/components/#creating-component-configuration) of the **Tableau** writer.
diff --git a/components/writers/database/bigquery/index.md b/components/writers/database/bigquery/index.md
index 000d3d62e..03e7c213e 100644
--- a/components/writers/database/bigquery/index.md
+++ b/components/writers/database/bigquery/index.md
@@ -17,7 +17,7 @@ To access and write to your BigQuery dataset, you need to set up a Google Servic
 - Go to [**Google Cloud Platform Console > IAM & admin > Service accounts**](https://console.cloud.google.com/iam-admin/serviceaccounts).
 - Select the project you want the writer to have access to.
 - Click **Create Service Account**.
-- Select an appropriate **Service account name** (e.g., `Keboola Connection BigQuery Writer`).
+- Select an appropriate **Service account name** (e.g., `Keboola BigQuery data source`).
 
 {: .image-popup}
 ![Screenshot - Create service account](/components/writers/database/bigquery/google-1.png)
diff --git a/components/writers/database/index.md b/components/writers/database/index.md
index 0d0f49b11..d34878287 100644
--- a/components/writers/database/index.md
+++ b/components/writers/database/index.md
@@ -6,7 +6,7 @@ redirect_from:
 
 ---
 
-Writers export data from Keboola Connection to SQL databases:
+Writers export data from Keboola to SQL databases:
 
 - [Google BigQuery](/components/writers/database/bigquery/) --- sends tables to a [Google BigQuery](https://cloud.google.com/bigquery/) dataset.
 - [Exasol](/components/writers/database/exasol/) --- sends tables to a [Exasol](https://www.exasol.com) database.
diff --git a/components/writers/database/redshift/index.md b/components/writers/database/redshift/index.md
index 613d15f64..a0c2f3f99 100644
--- a/components/writers/database/redshift/index.md
+++ b/components/writers/database/redshift/index.md
@@ -105,12 +105,12 @@ Additionally, you can specify a **Primary key** of the table, a simple column **
 
 ## Using Keboola Provisioned Database
 The writer offers the option to create a [Keboola Provisioned database](#keboola-redshift-database) for you. You can
-use this database to connect Keboola Connection to a wide range of consumers --- especially Business Intelligence tools and Analytics.
+use this database to connect Keboola to a wide range of consumers --- especially Business Intelligence tools and Analytics.
 The database can be queried in real time but is still completely isolated from your project Storage.
 
 ### Connect to Looker
 It is possible to use the Redshift writer to share data with [Looker](https://looker.com/).
-To share data between your Keboola Connection project and PowerBI, choose **Keboola Redshift Database** when configuring the credentials.
+To share data between your Keboola project and PowerBI, choose **Keboola Redshift Database** when configuring the credentials.
 The writer will create a dedicated database for you and give you credentials. Run the writer and when it is finished, you can
 connect the Looker data sources. Follow the official
 [instructions](https://docs.looker.com/setup-and-management/connecting-to-db). Note that you
@@ -119,14 +119,14 @@ can skip a number of steps because a dedicated user is already created for you.
 ### Connect to Power BI Desktop
 It is possible to use the Redshift writer to share data with [Power BI Desktop](https://powerbi.microsoft.com/en-us/desktop/) or
 [Tableau Online](https://www.tableau.com/products/cloud-bi).
-To share data between your Keboola Connection project and PowerBI, choose **Keboola Redshift Database** when configuring the credentials.
+To share data between your Keboola project and PowerBI, choose **Keboola Redshift Database** when configuring the credentials.
 The writer will create a dedicated database for you and give you credentials. Run the writer and when it is finished, you can
 connect the Power BI data sources. Follow the official [instructions for Power BI Desktop](https://docs.microsoft.com/en-us/power-bi/desktop-connect-redshift).
 
 ### Connect to Qlik
 It is possible to use the Redshift writer to share data with [Qlik Sense](https://www.qlik.com/us/products/qlik-sense)
 and [QlikView](https://www.qlik.com/us/products/qlikview).
-To share data between your Keboola Connection project and PowerBI, choose **Keboola Redshift Database** when configuring the credentials.
+To share data between your Keboola project and PowerBI, choose **Keboola Redshift Database** when configuring the credentials.
 The writer will create a dedicated database for you and give you credentials. Run the writer and when it is finished, you can
 connect the Qlik data sources. Follow the Qlik official [integration guide](https://help.qlik.com/en-US/connectors/Subsystems/ODBC_connector_help/Content/Connectors_ODBC/Redshift/Create-Redshift-connection.htm).
 
@@ -136,7 +136,7 @@ It is possible to use the Redshift writer to share data with [Tableau Desktop](h
 faster than loading data through [TDE files](https://www.tableau.com/about/blog/2014/7/understanding-tableau-data-extracts-part1)
 with the [TDE writer](/components/writers/bi-tools/tableau/).
 
-To share data between your Keboola Connection project and Tableau, choose **Keboola Redshift Database** when configuring the credentials.
+To share data between your Keboola project and Tableau, choose **Keboola Redshift Database** when configuring the credentials.
 The writer will create a dedicated database for you and give you credentials. Run the writer and when it is finished, you can
 connect the Tableau data sources. Follow the official
 [instructions for Tableau Desktop](https://help.tableau.com/current/pro/desktop/en-us/examples_amazonredshift.htm)
diff --git a/components/writers/database/snowflake/index.md b/components/writers/database/snowflake/index.md
index dfe42f303..ff58b53a6 100644
--- a/components/writers/database/snowflake/index.md
+++ b/components/writers/database/snowflake/index.md
@@ -108,14 +108,14 @@ Additionally, you can specify a **Primary key** of the table, a simple column **
 
 ## Using Keboola-Provisioned Database
 The writer offers the option to create a [Keboola-provisioned database](#keboola-snowflake-database) for you. You can
-use this database to connect Keboola Connection to a wide range of consumers --- especially Business Intelligence tools and Analytics.
+use this database to connect Keboola to a wide range of consumers --- especially Business Intelligence tools and Analytics.
 The database can be queried in real time, but is still completely isolated from your project Storage. The database is
 limited so that the data can be only read from the database and that the query execution time is limited to
 900 seconds (15 minutes).
 
 ### Connect to Looker
 It is possible to use the Snowflake writer to share data with [Looker](https://looker.com/).
-To share data between your Keboola Connection project and PowerBI, choose the **Keboola Snowflake database** when configuring the credentials.
+To share data between your Keboola project and PowerBI, choose the **Keboola Snowflake database** when configuring the credentials.
 The writer will create a dedicated database for you and give you credentials. Run the writer and when it is finished, 
 connect the Looker data sources. Follow the official [instructions](https://docs.looker.com/setup-and-management/connecting-to-db).
 There are also some [Snowflake specific settings](https://docs.looker.com/setup-and-management/database-config/snowflake#adding_the_connection). Note that you
@@ -123,14 +123,14 @@ can skip a number of steps because a dedicated user is already created for you.
 
 ### Connect to Power BI Desktop
 It is possible to use the Snowflake writer to share data with [Power BI Desktop](https://powerbi.microsoft.com/en-us/desktop/).
-To share data between your Keboola Connection project and PowerBI, choose the **Keboola Snowflake database** when configuring the credentials.
+To share data between your Keboola project and PowerBI, choose the **Keboola Snowflake database** when configuring the credentials.
 The writer will create a dedicated database for you and give you credentials. Run the writer and when it is finished, connect the Power BI data sources. Follow the official 
 [instructions for Power BI Desktop](https://docs.microsoft.com/en-us/power-bi/desktop-connect-snowflake).
 
 ### Connect to Qlik
 It is possible to use the Snowflake writer to share data with [Qlik Sense](https://www.qlik.com/us/products/qlik-sense)
 and [QlikView](https://www.qlik.com/us/products/qlikview).
-To share data between your Keboola Connection project and PowerBI, choose the **Keboola Snowflake database** when configuring the credentials.
+To share data between your Keboola project and PowerBI, choose the **Keboola Snowflake database** when configuring the credentials.
 The writer will create a dedicated database for you and give you credentials. Run the writer and when it is finished, connect the Qlik data sources. Follow the Qlik official
 [integration guide](https://help.qlik.com/en-US/connectors/Subsystems/ODBC_connector_help/Content/Connectors_ODBC/Snowflake/Create-Snowflake-connection.htm).
 
@@ -140,7 +140,7 @@ It is possible to use the Snowflake writer to share data with [Tableau Desktop](
 faster than loading data through [TDE files](https://www.tableau.com/about/blog/2014/7/understanding-tableau-data-extracts-part1)
 with the [TDE writer](/components/writers/bi-tools/tableau/).
 
-To share data between your Keboola Connection project and Tableau, choose the **Keboola Snowflake database** when configuring the credentials.
+To share data between your Keboola project and Tableau, choose the **Keboola Snowflake database** when configuring the credentials.
 The writer will create a dedicated database for you and give you credentials. Run the writer and when it is finished, connect the Tableau data sources. Follow the official 
 [instructions for Tableau Desktop](https://help.tableau.com/current/pro/desktop/en-us/examples_snowflake.htm)
 or for [Tableau Online](https://help.tableau.com/current/online/en-us/to_connect_live_sql.htm). Use the username/password authentication method.
diff --git a/components/writers/index.md b/components/writers/index.md
index dda0668cd..423308ad5 100644
--- a/components/writers/index.md
+++ b/components/writers/index.md
@@ -19,7 +19,7 @@ Data destination connectors can be grouped by their primary purpose:
 - **Business Intelligence**: [Tableau](/components/writers/bi-tools/tableau/), [GoodData](/components/writers/bi-tools/gooddata/), [Looker](/components/writers/bi-tools/looker/), and more
 - **Databases**: [MySQL](/components/writers/database/mysql/), [Oracle](/components/writers/database/oracle/), [PostgreSQL](/components/writers/database/postgresql/), [Amazon Redshift](/components/writers/database/redshift/), [Snowflake](/components/writers/database/snowflake/), [Synapse](/components/writers/database/synapse/), and more
 - **Generic Storage**: [AWS S3](/components/writers/storage/aws-s3/), [Dropbox](/components/writers/storage/dropbox/), [Google Drive](/components/writers/storage/google-drive/),
-[Google Sheets](/components/writers/storage/google-sheets/), [Keboola Connection Storage](/components/writers/storage/storage-api/), and more
+[Google Sheets](/components/writers/storage/google-sheets/), [Keboola Storage](/components/writers/storage/storage-api/), and more
 - [Other](/components/writers/other/) data destination connectors such as Azure Event Hub
 
 For a definitive list of usable data destination connectors, see your project **Data Destinations** section.
diff --git a/components/writers/other/index.md b/components/writers/other/index.md
index c431d9f3d..822f73493 100644
--- a/components/writers/other/index.md
+++ b/components/writers/other/index.md
@@ -3,7 +3,7 @@ title: Other Writers
 permalink: /components/writers/other/
 ---
 
-Writers export data from Keboola Connection to external systems.
+Writers export data from Keboola to external systems.
 Apart from writers for business intelligence platforms, databases and storage, there are
 writers that do not fall into any of the above mentioned categories:
 
diff --git a/components/writers/storage/index.md b/components/writers/storage/index.md
index a85ad76e1..7cf8ecf34 100644
--- a/components/writers/storage/index.md
+++ b/components/writers/storage/index.md
@@ -6,7 +6,7 @@ redirect_from:
 
 ---
 
-Writers export data from Keboola Connection to external systems. The following extractors
+Writers export data from Keboola to external systems. The following extractors
 allow to push data to generic storage services:
 
 - [AWS S3](/components/writers/storage/aws-s3/) --- writes CSV files to a single AWS S3 bucket with additional postprocessing.
@@ -14,7 +14,7 @@ allow to push data to generic storage services:
 - [Google Cloud Storage](/components/writers/storage/google-cloud-storage/) --- writes tables and files to Google Cloud Storage.
 - [Google Drive](/components/writers/storage/google-drive/) --- writes tables as CSV files or entire Google Sheet files.
 - [Google Sheets](/components/writers/storage/google-sheets/) --- writes tables as individual sheets of a Google Sheet file, or appends rows to an existing sheet.
-- [Keboola Connection Storage](/components/writers/storage/storage-api/) --- writes tables to a different Keboola Connection project; can be used where [Data Catalog](/catalog/) cannot.
+- [Keboola Connection Storage](/components/writers/storage/storage-api/) --- writes tables to a different Keboola project; can be used where [Data Catalog](/catalog/) cannot.
 - [OneDrive](/components/writers/storage/onedrive/) --- writes tables as individual sheets of a OneDrive Excel file, or appends rows to an existing sheet.
 - [SFTP](/components/writers/storage/sftp/) --- writes tables and files to a remote SFTP server.
 - And [more](https://components.keboola.com/components)
diff --git a/components/writers/storage/storage-api/index.md b/components/writers/storage/storage-api/index.md
index ee2f8f504..cb5e2087b 100644
--- a/components/writers/storage/storage-api/index.md
+++ b/components/writers/storage/storage-api/index.md
@@ -8,7 +8,7 @@ redirect_from:
 * TOC
 {:toc}
 
-This writer loads single or multiple tables from your current project into a different Keboola Connection project.
+This writer loads single or multiple tables from your current project into a different Keboola project.
 The component can be used in situations where [Data Catalog](/catalog/)
 cannot, e.g., moving data between two different [organizations](/management/organization) or regions.
 
diff --git a/index.md b/index.md
index 70636d728..d682cdf93 100644
--- a/index.md
+++ b/index.md
@@ -34,8 +34,8 @@ Rest assured, we're here to support you whenever needed. Reach out via email at
 - [www.keboola.com](https://www.keboola.com/) – our main web page
 - [blog.keboola.com](https://blog.keboola.com/) – something to read for data analysts
 - [500.keboola.com](https://500.keboola.com/) – something to read for tech geeks
-- [developers.keboola.com](https://developers.keboola.com) – documentation for extending or integrating Keboola Connection
+- [developers.keboola.com](https://developers.keboola.com) – documentation for extending or integrating Keboola
 
 ## We Highly Appreciate Your Input!
-Feel free to utilize the support form within your Keboola project to share feedback, request new features or components, 
+Feel free to use the support form within your Keboola project to share feedback, request new features or components, 
 or engage in a conversation with us. Your insights are valuable, and we're here to listen and collaborate.
diff --git a/management/account/index.md b/management/account/index.md
index 97a75bcd7..a53dfe77c 100644
--- a/management/account/index.md
+++ b/management/account/index.md
@@ -9,10 +9,10 @@ permalink: /management/account/
 Account management allows you to configure your own account.
 You can reach your account settings from two places:
 
-1. Keboola Connection home page
+1. Keboola home page
 2. Projects
 
-Go to the Keboola Connection home page and select **Account Settings** in the little drop down box at the top:
+Go to the Keboola home page and select **Account Settings** in the little drop down box at the top:
 
 {: .image-popup}
 ![Screenshot -- Account Settings](/management/account/account-setting-1.png)
@@ -194,7 +194,7 @@ projects but are typically used for ad-hoc projects, hackathons, and PoCs.
 ![Screenshot -- Promo codes](/management/account/promo-codes.png)
 
 ## User Sessions
-Each time you sign in to the Keboola Connection user interface, a *user session* is created.
+Each time you sign in to the Keboola user interface, a *user session* is created.
 The session is closed after an explicit logout, after **48 hours** of inactivity or when the browser is closed.
 
 You can sign in to your account multiple times from different devices (or browser windows).
diff --git a/management/index.md b/management/index.md
index f6f4e6b6c..b79463b7f 100644
--- a/management/index.md
+++ b/management/index.md
@@ -8,13 +8,13 @@ redirect_from:
 * TOC
 {:toc}
 
-Everything you do in Keboola Connection must take place within a Keboola Connection **Project**, its basic organizational unit.
+Everything you do in Keboola must take place within a Keboola **Project**, its basic organizational unit.
 All projects are grouped into [**Organizations**](/management/organization/).
 
 ### Data Governance
-Everything that happens with your data in Keboola Connection at any stage of your project is recorded.
+Everything that happens with your data in Keboola at any stage of your project is recorded.
 It enables you to use your uploaded data for other tables, access previous versions of your tables, and
-extract all your project data. Everything done in Keboola Connection is traceable, and if possible, also recoverable.
+extract all your project data. Everything done in Keboola is traceable, and if possible, also recoverable.
 
 - [**Jobs**](/management/jobs/#jobs) --- give you an overview of all your jobs,
 running and finished (what tables were modified, how much data was transferred and
@@ -23,19 +23,19 @@ what events occurred during the job execution).
 which were uploaded/downloaded into your project.
 - [**Table Snapshots**](/storage/tables/backups/#table-snapshots) --- allow you to revert data
 to an earlier version (either revert the contents of a table or copy the table into another one).
-- [**Data Takeout**](/management/project/export/) --- allows you to get your data back from us; in Keboola Connection, you are
+- [**Data Takeout**](/management/project/export/) --- allows you to get your data back from us; in Keboola, you are
 always the sole owner of your data. Data Takeout is especially useful for proof-of-concept projects.
 - [**Trash tab**](/components/#delete-configuration) --- allows you to list and restore deleted configurations.
 
 ### User Management
-There are three types of Keboola Connection [project users](/management/project/users/):
+There are three types of Keboola [project users](/management/project/users/):
 
-- **Administrators** --- are all equal as most Keboola Connection operations generally require access to most of the data and functions. These are full-
+- **Administrators** --- are all equal as most Keboola operations generally require access to most of the data and functions. These are full-
 fledged trusted users that count against your project quota.
 - **Guest Users** --- with full access to the project data and [limited access](/management/project/users/#user-roles) to project functions. These users 
 count against your project quota.
 - **Tokens/Service Users** --- with [limited access](/management/project/tokens/#limited-tokens) to project data. They can only read or write to
-selected buckets, sending data directly to your Keboola Connection project. These users have only [API tokens](/management/project/tokens/). They can't use the UI and they do not
+selected buckets, sending data directly to your Keboola project. These users have only [API tokens](/management/project/tokens/). They can't use the UI and they do not
  count against your project quota.
 
 ### Project Status
diff --git a/management/jobs/index.md b/management/jobs/index.md
index 1cf67ec7b..eeb2cb2a4 100644
--- a/management/jobs/index.md
+++ b/management/jobs/index.md
@@ -6,7 +6,7 @@ permalink: /management/jobs/
 * TOC
 {:toc}
 
-Most of the things done in Keboola Connection run as background, asynchronous jobs.
+Most of the things done in Keboola run as background, asynchronous jobs.
 For an overview of all jobs, running and finished, go to the **Jobs** section:
 
 {: .image-popup}
@@ -97,7 +97,7 @@ the waiting state under the following conditions:
     - Unless it is a transformation job, in which case the same configuration is allowed to run, provided that it is executed by different [tokens](/management/project/tokens/).
 
 ## Storage Jobs
-Not only we record all jobs executed in your Keboola Connection project, we also record all data that was uploaded
+Not only we record all jobs executed in your Keboola project, we also record all data that was uploaded
 into it. Go to **Storage** and click the **Jobs** tab:
 
 {: .image-popup}
@@ -109,7 +109,7 @@ When you click an **importTable** job, you'll see the Storage job detail:
 ![Screenshot - Storage Job Detail](/management/jobs/storage-jobs-detail.png)
 
 Clicking **File ID** will take you to the **Files** section in **Storage**,
-where all data pushed into your Keboola Connection project is stored.
+where all data pushed into your Keboola project is stored.
 You can download the data and import it into other tables, or you can revert to an older table version.
 
 {: .image-popup}
diff --git a/management/organization/index.md b/management/organization/index.md
index c3e40ab16..0a11972a3 100644
--- a/management/organization/index.md
+++ b/management/organization/index.md
@@ -6,9 +6,9 @@ permalink: /management/organization/
 * TOC
 {:toc}
 
-Keboola Connection projects are grouped into **organizations**. Each organization is assigned to a **maintainer** (either Keboola or
+Keboola projects are grouped into **organizations**. Each organization is assigned to a **maintainer** (either Keboola or
 Keboola Partner), who is also primarily responsible for L1 support unless agreed otherwise.
-[Keboola Connection projects](/management/#project-status), organizations,
+[Keboola projects](/management/#project-status), organizations,
 and maintainers are therefore organized into a hierarchy:
 
 {: .image-popup}
@@ -43,7 +43,7 @@ The same goes for maintainers.
 {: .image-popup}
 ![Screenshot - Organizations Users](/management/organization/organization-2.png)
 
-Newly added organization members get an email confirmation, and if without a Keboola Connection account,
+Newly added organization members get an email confirmation, and if without a Keboola account,
 they are [invited to create one](/management/project/users/#new-user).
 Removed members receive an email notification.
 
@@ -87,7 +87,7 @@ The description for support access will reflect the current setting.
 ### Require MFA
 It is possible to set the [Multi-factor Authentication](/management/account/#multi-factor-authentication) (MFA) requirement
 for all projects in the organization. When MFA is required for an entire organization, users without MFA enabled
-can still log in to Keboola Connection, but they cannot access any projects in the organization. The list of users
+can still log in to Keboola, but they cannot access any projects in the organization. The list of users
 without MFA is shown when enabling the MFA requirement for the entire organization.
 
 {: .image-popup}
diff --git a/management/pay-as-you-go/index.md b/management/pay-as-you-go/index.md
index 06d9fd2c2..73641d686 100644
--- a/management/pay-as-you-go/index.md
+++ b/management/pay-as-you-go/index.md
@@ -51,7 +51,7 @@ If your credit card is declined when purchasing more minutes, possible reasons i
 - The transaction exceeds the credit card’s maximum transaction amount.
 
 ## Free Plan Project Upgrade
-Any Free Plan project can be upgraded to a [standard Keboola Connection project](/management/project/) upon the execution 
+Any Free Plan project can be upgraded to a [standard Keboola project](/management/project/) upon the execution 
 of our standard order form under the Master Software Subscription Agreement (MSSA).
 
 ## Project Deletion
diff --git a/management/project/export/index.md b/management/project/export/index.md
index f7405fbdb..db8cc6d6e 100644
--- a/management/project/export/index.md
+++ b/management/project/export/index.md
@@ -17,7 +17,7 @@ This can come in handy when
 - leaving us.
 
 **Important**: Do not confuse this feature with the project backup.
-Takeout data **cannot** be automatically imported into Keboola Connection (recovering a project must be done by Keboola Connection Support).
+Takeout data **cannot** be automatically imported into Keboola (recovering a project must be done by Keboola Support).
 
 Things to have before you start:
 
@@ -84,7 +84,7 @@ Make sure to replace *keboola-data-takeout* in the above document with the true
 Having your S3 bucket named and its region set, along with the *Access Key ID* and *Secret Access Key* of the IAM user, you are ready to export the project.
 
 ## Export Project
-Go to Keboola Connection and select **Users & Settings**. In the **Settings** tab, click the **Data Takeout** button:
+Go to Keboola and select **Users & Settings**. In the **Settings** tab, click the **Data Takeout** button:
 
 {: .image-popup}
 ![Screenshot - Data Takeout](/management/project/export/data-takeout-project-settings.png)
diff --git a/management/project/limits/index.md b/management/project/limits/index.md
index 7f75f66ca..50f211d98 100644
--- a/management/project/limits/index.md
+++ b/management/project/limits/index.md
@@ -8,7 +8,7 @@ redirect_from:
 * TOC
 {:toc}
 
-Each Keboola Connection standard project has two kinds of limits:  
+Each Keboola standard project has two kinds of limits:  
 
 1. **Business limits** are set in your contract and define the business usage of our platform. 
 This can be seen as the **size** of your project. Exceeding them will earn you a call from us 
@@ -17,7 +17,7 @@ and a possible contract update conversation.
 2. **Platform limits** represent what our platform is **technically capable of**. Reaching or exceeding 
 these limits is either technically impossible, or it carries a risk of degraded performance.
 
-**Note:** These limits apply to standard Keboola Connection projects. The limits for [pay-as-you-go projects](/management/payg-project/) might differ.
+**Note:** These limits apply to standard Keboola projects. The limits for [pay-as-you-go projects](/management/payg-project/) might differ.
 
 ## Business Limits
 
@@ -39,7 +39,7 @@ and neither do [tokens](/management/project/tokens).
 
 ### Project Power -- Time Credits
 
-Project Power Credits is proportional to the sum of the elapsed time of all jobs executed in Keboola Connection. 
+Project Power Credits is proportional to the sum of the elapsed time of all jobs executed in Keboola. 
 Measured in milliseconds, presented in hours (1 hour = 3,600 seconds). Every job consumes different amount of Project Power Credits,
 based on 
 
@@ -47,10 +47,10 @@ based on
 - type of the job (sandbox, SQL transformation, Python transformation), and 
 - performance of the backend used for the job (templates basic, medium, and large).
 
-Below you will find an overview of time credits consumed by individual Keboola Connection job types. 
+Below you will find an overview of time credits consumed by individual Keboola job types. 
 If you need more information, please contact your CSM.
 
-| Types of jobs in Keboola Connection   | Base job                | Time credits          |
+| Types of jobs in Keboola              | Base job                | Time credits          |
 |---------------------------------------|-------------------------|-----------------------|
 | **Extractor job**                     | 1 hour                  | **2**                 |
 | **Writer job**                        | 1 GB out                | **0.2**               |  
@@ -99,7 +99,7 @@ across projects with different [backends](/storage/#backend-properties) (or betw
 with mixed backends).
 
 ## Platform Limits
-Apart from the business limits, there are limitations to **what the Keboola Connection platform can take**. These limits 
+Apart from the business limits, there are limitations to **what the Keboola platform can take**. These limits 
 are either defined by the underlying technologies or by what we believe is the correct use of the platform. 
 The technical platform limits are **non-negotiable** and **cannot be upgraded** by updating the contract. 
 Nonetheless, we certainly would like to hear if you hit them. 
diff --git a/management/project/migration/index.md b/management/project/migration/index.md
index bb2ea0768..ce21b2ed9 100644
--- a/management/project/migration/index.md
+++ b/management/project/migration/index.md
@@ -6,8 +6,8 @@ permalink: /management/project/migration/
 * TOC
 {:toc}
 
-Keboola Connection is available in multiple [stacks](/overview/#stacks). Each stack instance 
-is completely independent set of Keboola Connection services. Each project is fully contained within one of these stacks. 
+Keboola is available in multiple [stacks](/overview/#stacks). Each stack instance 
+is completely independent set of Keboola services. Each project is fully contained within one of these stacks. 
 In case you need to migrate a project between stacks for whatever reason, you can accomplish that in cooperation 
 with [Keboola Support](/management/support/).
 
@@ -47,7 +47,7 @@ based on [Changed in last](/transformations/mappings/#input-mapping) in
 transformations or writers, it will fetch all data on the first run.
 - Creation dates and authors of all configurations will be modified.
 - Orchestration IDs will be changed.
-- Each Keboola Connection stack has a different set of assigned [IP addresses](/components/ip-addresses/).
+- Each Keboola stack has a different set of assigned [IP addresses](/components/ip-addresses/).
 
 ## What Won't Be Migrated
 - Encrypted values
diff --git a/management/project/users/index.md b/management/project/users/index.md
index f333b5a9f..2464c1ee1 100644
--- a/management/project/users/index.md
+++ b/management/project/users/index.md
@@ -8,14 +8,14 @@ redirect_from:
 * TOC
 {:toc}
 
-To be able to work with Keboola Connection, each user needs to have the following:
+To be able to work with Keboola, each user needs to have the following:
 
-- Platform-wide Keboola Connection account
+- Platform-wide Keboola account
 - Access to a specific project
 
 Each user is, system-wide, **identified by their email address**.
 This means that you need to enter correct email addresses for existing users.
-Be especially careful about company aliases; from Keboola Connection's point of view, they are different users.
+Be especially careful about company aliases; from Keboola's point of view, they are different users.
 
 All operations performed by a user are technically done using the
 [master token](/management/project/tokens/#master-tokens). This is important for
@@ -83,7 +83,7 @@ they will never become a member of the project.
 The steps that follow an invitation differ depending on whether the user already exists or is new.
 
 ### New User
-If the user does not have a platform-wide Keboola Connection account yet, their name in the user list will be
+If the user does not have a platform-wide Keboola account yet, their name in the user list will be
 labelled as `Not activated yet`:
 
 {: .image-popup}
@@ -100,20 +100,20 @@ When they click the **Activate Your Account** button, they will be taken to the
 ![Screenshot -- Activation form](/management/project/users/register-2.png)
 
 After filling it in, the [login form](/management/project/users/#authentication) appears.
-They can immediately login to Keboola Connection and see their invitation to the project they have been invited to.
+They can immediately login to Keboola and see their invitation to the project they have been invited to.
 Once they accept it, you will see their chosen screen name in the user list:
 
 {: .image-popup}
 ![Screenshot -- User joined](/management/project/users/users-list-3.png)
 
 ### Existing User
-If the added user already has a Keboola Connection account, you will see their screen name in the user list right away:
+If the added user already has a Keboola account, you will see their screen name in the user list right away:
 
 {: .image-popup}
 ![Screenshot -- User joined](/management/project/users/users-list-2.png)
 
 ***Note:** If you intend to invite an existing user, it is a good idea to verify the screen name.
-If you see `Not activated yet` instead of the screen name, it means that there is no Keboola Connection account associated with the email address.*
+If you see `Not activated yet` instead of the screen name, it means that there is no Keboola account associated with the email address.*
 
 The user will receive an email invitation:
 
@@ -166,7 +166,7 @@ No other user can enter the project. If Auto Join is disabled, maintainer users
 see the name of the project and request access which must be approved by a current member of the project.
 
 ## Authentication
-There are three options for authenticating a Keboola Connection account:
+There are three options for authenticating a Keboola account:
 
 - Google account
 - Combination of an email address and the associated password
@@ -175,15 +175,15 @@ There are three options for authenticating a Keboola Connection account:
 The options are described in detail below.
 
 ### Google Account
-If you have a Google Account (Gmail), you can use it to authenticate to Keboola Connection.
+If you have a Google Account (Gmail), you can use it to authenticate to Keboola.
 Click the respective button on the login page:
 
 {: .image-popup}
 ![Screenshot -- Login Page](/management/project/users/login-1.png)
 
-Then follow the Google instructions to authorize Keboola Connection.
-No configuration in Keboola Connection is necessary to enable Google Account login.
-Bear in mind, however, that the Google Account email must match the email you are using in Keboola Connection.
+Then follow the Google instructions to authorize Keboola.
+No configuration in Keboola is necessary to enable Google Account login.
+Bear in mind, however, that the Google Account email must match the email you are using in Keboola.
 
 ### Multi-Factor Authentication
 Enable multi-factor authentication (MFA) in your [account settings](/management/account/#multi-factor-authentication).
diff --git a/orchestrator/design/index.md b/orchestrator/design/index.md
index 1456486cf..25792cdbf 100644
--- a/orchestrator/design/index.md
+++ b/orchestrator/design/index.md
@@ -118,9 +118,9 @@ Cons:
 
 ## Mirroring
 A third approach is *Mirroring* and it is in a way a mix of the previous two.
-It can be described as *"Bring the most current data in Keboola Connection, then do whatever you like"*. That means
+It can be described as *"Bring the most current data in Keboola, then do whatever you like"*. That means
 you set up a separate orchestration for every single data source and schedule them
-to run as fast possible. Then you can assume that the data you have in Keboola Connection is always current, and you
+to run as fast possible. Then you can assume that the data you have in Keboola is always current, and you
 can build [pipelines](#pipelines) on top of that. The core difference is that the pipelines no longer contain the
 extraction phase.
 
@@ -172,7 +172,7 @@ Cons:
 - Needs organization of Storage to clearly mark read-to-use data.
 
 ## Conclusions
-The Keboola Connection platform has very few constraints on the execution of tasks. That means there is no one true way of
+The Keboola platform has very few constraints on the execution of tasks. That means there is no one true way of
 doing things. Here we have outlined three possible logical approaches. Whether they are suitable for you
 or not is best determined by consulting your Maintainer or Partner.
 You may of course combine the approaches as well, or do things your own way.
diff --git a/orchestrator/index.md b/orchestrator/index.md
index f52ff5d4f..2ec08da77 100644
--- a/orchestrator/index.md
+++ b/orchestrator/index.md
@@ -6,9 +6,9 @@ permalink: /orchestrator/
 ***Note:** This page will be updated soon. *
 
 Bringing systems for data loading, manipulation and writing together is what makes
-[Keboola Connection](/overview/) so powerful and easy to use. With [extractors](/components/extractors/), you can fetch
+[Keboola](/overview/) so powerful and easy to use. With [source connectors](/components/extractors/), you can fetch
 data from data sources into [Storage](/storage/). With [transformations](/transformations/) and
-[applications](/components/applications/), you can modify the data. With [writers](/components/writers/), you can
+[applications](/components/applications/), you can modify the data. With [destination connectors](/components/writers/), you can
 send it to destination systems.
 
 The Orchestrator component has two important features:
diff --git a/orchestrator/running/index.md b/orchestrator/running/index.md
index 83282ed8b..22d38525a 100644
--- a/orchestrator/running/index.md
+++ b/orchestrator/running/index.md
@@ -141,7 +141,7 @@ buckets or tables.
 It means that the token will also work if it has access to no components.*
 
 ### Parallel Jobs
-Running things in the Keboola Connection platform is designed around the concept of [background jobs](/management/jobs/). One of the key properties is 
+Running things in the Keboola platform is designed around the concept of [background jobs](/management/jobs/). One of the key properties is 
 that the same configuration of the same component cannot run in parallel. This is primarily a safety measure to maintain consistency of
 the output data produced by that configuration. In a more technical way, we can say that
 *jobs running the same configuration are **serialized***.
diff --git a/overview/google-data-policy.md b/overview/google-data-policy.md
index 86da56688..188625de4 100644
--- a/overview/google-data-policy.md
+++ b/overview/google-data-policy.md
@@ -1,10 +1,10 @@
 ---
-title: Keboola Connection Overview
+title: Keboola Overview
 permalink: /overview/google-data-policy/
 ---
 
 ## Google Data Usage Policy
-Keboola Connection, our platform, is the host of smaller application components that interact with various Google APIs and services. 
+Keboola, our platform, is the host of smaller application components that interact with various Google APIs and services. 
 It also contains Storage, a database-like component where users store their data.
 
 Watch the following introduction video for basic info about our platform:
@@ -16,15 +16,15 @@ The components working directly with Google APIs and services are divided into t
 Extractors are components of our platform --- small apps that download data for our users from APIs of various Google services: 
 Gmail, Google Drive, Google Analytics, Google BigQuery, etc.
 All the data that extractors obtain from the APIs is then imported into our Storage.
-The data (in Storage) can be accessed only by those users who are in the KBC project that downloaded the data.
-Other users cannot download, see or edit data or another user’s documents. Collaborators within a KBC project are only able to run 
+The data (in Storage) can be accessed only by those users who are in the Keboola project that downloaded the data.
+Other users cannot download, see or edit data or another user’s documents. Collaborators within a Keboola project are only able to run 
 the extraction of the data or document that the authorized user has selected. The collaborators can work with the data downloaded into Storage.
 
 ### Writers
 Writers are also components of our platform --- small apps that write data for our users from Storage into various Google services: Google Drive, Google BigQuery, etc.
 In Storage, a user selects a data table which they want to upload into their account within the Google service, e.g., Google Sheets.
 After being authorized, they can select where they want to store the data (e.g., a folder and a spreadsheet in Google Sheets).
-Other users cannot see, download, edit, or manipulate this user’s data or documents (even within the same KBC project). 
+Other users cannot see, download, edit, or manipulate this user’s data or documents (even within the same Keboola project). 
 They can only run the component; it means that the table from Storage that was chosen by the authorized user will be written into the authorized account within the Google service.
 
 ### Common
diff --git a/overview/index.md b/overview/index.md
index ba2b86320..6cccdbc5c 100644
--- a/overview/index.md
+++ b/overview/index.md
@@ -1,39 +1,35 @@
 ---
-title: Keboola Connection Overview
+title: Keboola Overview
 permalink: /overview/
 ---
 
 * TOC
 {:toc}
 
-Keboola is a cloud-based data integration and transformation platform that provides tools for data engineering, integration, transformation, and orchestration. 
+Keboola is a cloud-based platform for all your data integration, transformation, and orchestration needs. 
+Designed for data engineers, analysts, and scientists, Keboola **simplifies data processes, enabling efficient management and insightful analysis**. 
 
-Key aspects of Keboola include:
-- **Data Integration** – extracting data from diverse sources, such as databases, cloud services, and APIs, as well as loading it into a wide range of data destinations.
-- **Data Storage** – data processed in Keboola is stored in its data warehousing infrastructure (Snowflake, BigQuery, Redshift, Synapse or others), making it easily accessible for analysis.
-- **Data Manipulation** – wide range of tools to interact (clean, enrich, transform, analyse) with the data using SQL, Python, R or other languages.
-- **Automation** – users can build data Flows and automate the entire process end to end. 
+Key features of Keboola:
+- **Data Integration:** Effortlessly extract data from various sources like databases, cloud services, and APIs. Load it seamlessly into destinations of your choice for comprehensive analysis.
+- **Data Storage:** Use Keboola's robust data warehousing (Snowflake, BigQuery, Redshift, Synapse, etc.) for secure and accessible data storage. 
+- **Data Manipulation:** With our extensive toolset, clean, enrich, and transform your data using SQL, Python, R, and more directly within Keboola.
+- **Automation:**  Automate your data workflows end-to-end with Keboola's intuitive Flows, saving time and reducing manual errors.
 
-Keboola is a preferred choice for data engineers, data analysts, and data scientists seeking to **optimize data processes and establish a unified platform for data-
-related tasks**. For organizations, one of Keboola’s paramount advantages lies in the consolidation of the entire data stack. By using an all-in-one platform, 
-organizations can efficiently **govern and manage the data ecosystem**, making it invaluable for extracting insights, whether for business intelligence, reporting, 
-or more advanced data science and machine learning applications.
+***Note:** In the early days, we called the Keboola platform **Keboola Connection (KBC)**.  Although the platform's name is **Keboola** now, you will probably see 
+the word Connection or the abbreviation 'KBC' occasionally in table names, column names, etc.*  
 
 ## Deployment Options
-The Keboola platform is typically **fully managed by Keboola**. However, it also supports **multi-tenant, hybrid, and private cloud deployments**.
+Keboola supports various deployment models to suit your specific needs:
 
-In the most common multi-tenant deployment, all resources are managed and fully maintained by Keboola.
-
-In the multi-tenant **'bring your own database'** option, you can use your own Snowflake, BigQuery, Redshift, Synapse, or other data storage, 
-while the rest is still managed and maintained by Keboola.
-
-With the single-tenant option, Keboola is **deployed to your cloud environment** (AWS, Azure, or GCP) and supports authentication via your own identity management.
+- **Fully Managed:** Let us handle everything for you.
+- **Multi-Tenant:** Let us fully manage and maintain all resources.
+- **Multi-Tenant with BYO Database:** Use your data storage (Snowflake, BigQuery, Redshift, Synapse, etc.) while we manage the rest.
+- **Single-Tenant:** Deploy Keboola in your cloud environment (AWS, Azure, GCP) for maximum control and security.
 
 ## Keboola Architecture
-Your Keboola account is structured around [**projects**](/management/project/). While the [Free Plan](/management/payg-project/) includes 
-a single project, clients with a subscription to Keboola can enjoy the flexibility of multiple projects organized within 
-a versatile [**multi-project architecture**](/tutorial/onboarding/architecture-guide/). This architecture not only accommodates the implementation 
-of a Data Mesh approach but also supports a robust data warehouse structure tailored to specific needs and use cases.
+Keboola organizes accounts by [**projects**](/management/project/), offering a single project on the [Free Plan](/management/payg-project/) and multiple projects 
+under its subscription models. This [**multi-project architecture**](/tutorial/onboarding/architecture-guide/) supports a Data Mesh strategy and a customizable 
+data warehouse structure for various needs and use cases.
 
 The following diagram illustrates the structure of a single Keboola project, composed of various categorized components described below.
 
@@ -41,127 +37,132 @@ The following diagram illustrates the structure of a single Keboola project, com
 ![Keboola Architecture 1](/overview/project-structure1.png)
 
 ### Data Source Connectors
-[Data sources connectors](/components/extractors/), formerly known as [extractors](/components/extractors/) are Keboola components used 
-to gather data from various sources. They can connect to APIs of external services, databases, applications, object storages, and many others.
+[Data sources connectors](/components/extractors/), formerly known as extractors, are Keboola components used 
+to gather data from various sources. They can connect to APIs of external services, databases, applications, object storage, and many others.
 
 ### Storage
-[Storage](/storage/) is the central component in Keboola responsible for data management and access. It comprises two sections: [File Storage](/storage/files/) 
-with all raw files uploaded to your project, and [Table Storage](https://help.keboola.com/storage/tables/) where all data tables are organized into buckets, 
-further categorized into in and out stages.
-
-This component operates as an abstraction layer on top of various [backend](/transformations/#backends) database engines 
-including [Snowflake](https://www.snowflake.com/), [Redshift](https://aws.amazon.com/redshift/), [BigQuery](https://cloud.google.com/bigquery/),
-[Synapse](https://azure.microsoft.com/en-us/services/synapse-analytics/) and more. It offers a vital API Storage API 
-for interactions with the data, facilitating communication with other components and third-party applications.
+[Storage](/storage/) is the central component in Keboola responsible for data management and access. It comprises two sections: 
 
-### Transformations
-[Transformations](/transformations/) allow end-users to create custom scripts in [SQL](https://en.wikipedia.org/wiki/SQL) (Snowflake, Redshift, BigQuery, and 
-more), dbt, [Julia](https://julialang.org/), [Python](https://www.python.org/about/), and [R](https://www.r-project.org/about.html). 
-Keboola provides Workspaces, offering a safe environment for experimentation, analytics and transformation development.
+- [File Storage](/storage/files/), with all raw files uploaded to your project, and
+- [Table Storage](https://help.keboola.com/storage/tables/), where all data tables are organized into buckets, further categorized into in and out stages.
 
-[Workspaces](/transformations/workspace/) are managed environments for code development. SQL workspaces are accessible through the database provider's IDE or your 
-preferred SQL IDE. Python, R, or Julia workspaces are available through Keboola's hosted and managed Jupyter Lab environment. These workspaces can be shared with 
-other users to facilitate collaboration.
+This component acts as a middle layer that works with various [backend](/transformations/#backends) database systems like 
+[Snowflake](https://www.snowflake.com/), [Redshift](https://aws.amazon.com/redshift/), [BigQuery](https://cloud.google.com/bigquery/),
+[Synapse](https://azure.microsoft.com/en-us/services/synapse-analytics/), and others. It provides a key Storage API for working with data, 
+making it easier to connect with other parts of the system and third-party applications.
 
-### Data Destination Connectors
-[Data destination connectors](/components/writers/), formerly known as [writers](/components/writers/), are components responsible
-for output data delivery from Keboola to the systems and applications where the data gets used or consumed. These connectors often interface 
-with [relational databases](/components/writers/database/), BI, [reporting and analytics](/components/writers/bi-tools/) platforms, tools or applications.
+### Transformations & Workspaces
+[Transformations](/transformations/) allow you to manipulate data in your project. They are the tasks you want to perform and enable you to write custom scripts
+in [SQL](https://en.wikipedia.org/wiki/SQL) (Snowflake, Redshift, BigQuery, etc.), dbt, [Julia](https://julialang.org/), [Python](https://www.python.org/about/), 
+and [R](https://www.r-project.org/about.html). 
 
-### Full Automation
-Keboola provides the [Flows](https://help.keboola.com/orchestrator/) component, formerly known as [Orchestrator](https://help.keboola.com/orchestrator/), 
-to fully automate end-to-end processes. With flows, you can specify the execution order of individual connectors, transformations, and other components, 
-along with setting up parallelization. By adding a **schedule** or trigger, you can [automate](/orchestrator/) processes at specified intervals or times 
-of the day.
+All transformations operate on a copy of Storage data in an isolated environment — a [workspace](/transformations/workspace/), guaranteeing safety for your
+analyses and experimentation. Workspaces support collaborations and can be shared. 
 
-The platform automatically scales resources for to facilitate the automated processes.
+- **SQL workspaces** are accessible through the database provider's IDE or your preferred SQL IDE.
+- **Python, R, or Julia workspaces** are available through Keboola's hosted and managed Jupyter Lab environment.
 
 ### Applications
-Unlike the free-form transformations, [applications](/components/applications/) are **predefined blocks**, that enable users to perform advanced tasks such as 
+Unlike free-form transformations, [applications](/components/applications/) are **predefined blocks** that enable users to perform advanced tasks such as 
 sentiment analysis, association discovery, or histogram grouping. They can also enhance data, for example, by incorporating external data like weather or exchange 
 rates through third-party services.
 
 ### Data Apps
-[Data apps](/components/data-apps/) are user-friendly, interactive web applications designed to leverage data for insights or automated actions. These applications 
-are typically custom-built to address specific challenges, providing users with dynamic, purpose-built experiences. Examples of data apps include recommendation 
-engines, interactive segmentation tools, AI integration solutions, data visualization platforms, custom internal reporting tools for business teams, and financial 
-apps for gaining insights into spending patterns.
+[Data apps](/components/data-apps/) are simple web applications that can be deployed inside Keboola projects and also publicly accessed from outside the projects. 
+They are usually custom-built to address specific challenges, for example, recommendation engines, interactive segmentation tools, AI integration solutions, data 
+visualization platforms, custom internal reporting tools for business teams, and financial apps for gaining insights into spending patterns.
+
+### Data Destination Connectors
+[Data destination connectors](/components/writers/), formerly known as writers, are components responsible
+for output data delivery from Keboola to the systems and applications where the data gets used or consumed ([relational databases](/components/writers/database/), BI, [reporting and analytics](/components/writers/bi-tools/) platforms, tools, or applications).
+
+### Full Automation
+The [Flows](https://help.keboola.com/orchestrator/) component, formerly known as Orchestrator, helps you to fully automate end-to-end processes. 
+You can specify the order in which individual connectors, transformations, and other components will be run and set up parallelization. By adding
+a **schedule** or trigger, you can [automate](/orchestrator/) processes at specified intervals or times of the day.
+
+The platform automatically scales resources to facilitate the automated processes.
+
+### Development Branches
+The [Development Branches](/components/branches/) feature enables you to modify component settings without affecting active configurations or 
+entire orchestrated workflows. It's particularly useful for implementing significant project changes or when you need to be extra careful 
+about performing your changes safely.
 
 ## Keboola Governance
 ### Operational Metadata
-Keboola diligently collects a diverse array of [operational metadata](/management/jobs/#search-attributes), encompassing user activity, job status, data flow, 
-schema evolution, data pipeline performance, and adherence to a client's security rules. All project metadata is readily accessible within the client's Keboola 
-environment, empowering users to conduct in-depth analyses, audits, or event-driven actions.
+Keboola collects diverse [operational metadata](/management/jobs/#search-attributes), including user activity, job status, data flow, 
+schema evolution, data pipeline performance, and adherence to a client's security rules. All project metadata is accessible in your project and enables you 
+to perform in-depth analyses, audits, or event-driven actions.
 
-Leveraging this metadata, we dynamically and automatically construct data lineage, providing a real-time understanding of data origin and usage. This capability 
-serves both analytical and regulatory purposes, offering invaluable insights into the journey and utilization of data within the platform."
+This metadata enables us to automatically create data lineage, offering real-time insights into data origin and usage for analytical and regulatory needs and
+highlighting the data's journey and usage on the platform.
 
 ### Cost Monitoring
-Keboola meticulously gathers and organizes telemetry data encompassing every job execution and user activity. Within each job detail, information regarding 
-consumed credit units is available, allowing for the precise calculation of the associated dollar amount, effectively quantifying the cost of the process. This 
-granular level of detail enables the attribution of costs to specific departments, teams, use-cases, and individual users, providing comprehensive insights into 
-resource utilization.
+Keboola collects telemetry data on job executions and user activities, detailing credit units used per job for exact cost calculations. This allows costs to be 
+attributed to specific departments, teams, use cases, and users, offering detailed insights into resource use.
 
 ### Identity and Access management
-Effortlessly oversee user accounts within your organization, regulating their access to specific Keboola projects and datasets. Streamline data sharing across 
-your organization, ensuring a comprehensive understanding of each user's access privileges and fostering a transparent overview of data accessibility.
+Manage user accounts in your organization, controlling their access to specific Keboola projects and datasets. Simplify data sharing within your 
+organization, keep track of individual access rights, and promote clear visibility of data access.
 
 ## Extending the Platform 
 The Keboola platform, as an open environment consisting of many built-in interoperating components (Storage, transformations, data source connectors, etc.), 
-can be [extended](https://developers.keboola.com/extend/) with **arbitrary code to extract, transform or write data**.
+can be [extended](https://developers.keboola.com/extend/) with **arbitrary code to extract, transform, or write data**.
+
+You can extend the platform by creating
 
-There are two ways of extending the platform: creating [components](https://developers.keboola.com/extend/#component) (used as data destination connectors,
-applications and data source connectors) and creating components based on [Generic Extractor](https://developers.keboola.com/extend/#generic-extractor/).
+- [components](https://developers.keboola.com/extend/#component) (used as data source and destination connectors and applications).
+- components based on the [Generic Extractor](https://developers.keboola.com/extend/#generic-extractor/).
 
-All components can be created by us, your in-house teams or 3rd parties. They can easily use already existing data, ETL processes, and workflows. 
-The development platform provides you with automation of infrastructure, user management, data management, and essential services like [data catalog](/catalog/), 
-operational metadata, full governance, and reverse billing per job. The components can be kept private or offered to other Keboola users. Our market place 
-consists of hundreds of applications that are developed mainly by 3rd parties and can be natively used as part of the workflows you are creating. This provides a 
-great way for our users to really manage their environment and create a composable enterprise.
+Keboola, your in-house teams, or 3rd parties can create all components while using already existing data, ETL processes, and workflows. 
+The platform automates infrastructure, user, and data management, offering services like [data catalog](/catalog/), operational metadata, governance, 
+and reverse billing. Components can be private or shared with Keboola users via our marketplace featuring applications mainly from 3rd parties 
+to enhance workflows and support a composable enterprise.
 
-Components can be run as standard pieces of our Flows [LINK], obtaining the full support and services (a link to your
+Components can be run as standard pieces of our Flows [/tutorial/automate/#main-header], obtaining the full support and services (a link to your
 [components](https://components.keboola.com/components), [logs, etc.](https://developers.keboola.com/extend/common-interface/)).
 
 ### Keboola CLI
-[Keboola CLI](https://developers.keboola.com/cli/) (Command Line Interface) is a set of commands for operating your cloud data pipeline. It is available to 
-install in the Windows, macOS, and Linux environments.
+[Keboola CLI](https://developers.keboola.com/cli/) (Command Line Interface) is a set of commands for operating your cloud data pipeline. It can be installed in 
+the Windows, macOS, and Linux environments.
 
 ## Keboola Support
-When working with Keboola platform, you are never on your own and there are multiple [ways to obtain support](/management/support/) from us. 
+When working with the Keboola platform, you are never on your own, and there are multiple [ways to obtain support](/management/support/) from us. 
 To solve your problem or to gain context, our support staff may join your project when requested.
 
 ## Other Commonly Used Terms
-This section explains a few terms that are often used throughout these documentation pages.
+This section explains a few terms often used throughout these documentation pages.
 
 ### Stacks
-The Keboola platform is available in multiple stacks, these can be either multi-tenant or single-tenant. The current multi-tenant stacks are:
+The Keboola platform is available in multiple stacks, either multi-tenant or single-tenant. The current multi-tenant stacks are:
 
 - US Virginia AWS – [connection.keboola.com](https://connection.keboola.com/),
 - EU Frankfurt AWS – [connection.eu-central-1.keboola.com](https://connection.eu-central-1.keboola.com/).
 - EU Ireland Azure – [connection.north-europe.azure.keboola.com](https://connection.north-europe.azure.keboola.com/).
 - EU Frankfurt GCP - [connection.europe-west3.gcp.keboola.com](https://connection.europe-west3.gcp.keboola.com/)
 
-A **stack** is a combination of a datacenter location (region) and a cloud provider, and is identified by its domain (URL). The currently supported cloud 
-providers are [Amazon AWS](https://aws.amazon.com/), [Microsoft Azure](https://azure.microsoft.com/en-us/) and [Google Cloud](https://cloud.google.com/). A stack is a completely independent full instance 
-of Keboola platform services. That means that if you have projects in multiple stacks, you need to have multiple Keboola accounts.
+A **stack** combines a datacenter location (region) and a cloud provider and is identified by its domain (URL). The currently supported cloud 
+providers are [Amazon AWS](https://aws.amazon.com/), [Microsoft Azure](https://azure.microsoft.com/en-us/), and [Google Cloud](https://cloud.google.com/). 
+A stack is an entirely independent, full instance of Keboola platform services. That means that if you have projects in multiple stacks, you need to have 
+multiple Keboola accounts.
 
 Each stack uses a different network with a different set of **dedicated** [IP addresses](/components/ip-addresses/). 
-Our [developer documentation](https://developers.keboola.com/overview/api/#regions-and-endpoints) describes in more detail how to handle multiple stacks 
-when working with the API.
+Our [developer documentation](https://developers.keboola.com/overview/api/#regions-and-endpoints) describes how to handle multiple stacks 
+when working with the API in more detail.
 
-Single-tenant stacks are available for a single enterprise customer with a domain name in form `connection.CUSTOMER_NAME.keboola.com`.
+Single-tenant stacks are available for a single enterprise customer with a domain name in the form `connection.CUSTOMER_NAME.keboola.com`.
 
 ### Jobs
-Most things in Keboola platform are done using the batch approach; when you perform an operation, a [job](/management/jobs/) is created and executed 
-in the background. We also call these jobs **asynchronous**. Multiple jobs can be running at the same time and you can continue your work in the meantime.
+Most things in the Keboola platform are done using the batch approach; when you perform an action, a [job](/management/jobs/) is created and executed 
+in the background. We also call these jobs **asynchronous**. Multiple jobs can run simultaneously, and you can continue your work in the meantime.
 
 ### Tokens
-Every operation done within the Keboola platform must be authorized with a [token](/management/project/tokens/). Each Keboola user is automatically assigned 
-a token on their first login. Apart from that, tokens with limited access to some Keboola platform operations can be created (and shared with other people). 
-The principle of token authorization allows you, for example, to easily [share a single table](/management/project/tokens/#limited-tokens) from your Storage 
-with someone without them having to register to the Keboola platform (enter email/password).
+In Keboola, every action requires a [token](/management/project/tokens/) for authorization, automatically assigned to users at first login. Additionally, 
+tokens for restricted access can be created and shared. 
+This token system enables easy [sharing of specific resources](/management/project/tokens/#limited-tokens), like tables, without requiring platform registration.
 
 ### Input and Output Mapping
-To make sure your transformation does not harm data in Storage, [mapping](/transformations/mappings) separates source data from your script. A secure workspace 
-is created with data copied from the tables specified in the [input mapping](/transformations/mappings/#input-mapping). After the transformation has been executed 
-successfully, only tables and files defined in the [output mapping](/transformations/mappings/#output-mapping) are brought back to Storage.
+To make sure your transformation does not harm data in Storage, [mapping](/transformations/mappings) separates source data from your script. 
+A secure [workspace](https://help.keboola.com/transformations/workspace/#main-header) is created with data copied from the tables specified 
+in the [input mapping](/transformations/mappings/#input-mapping). After the transformation is executed successfully, only tables and files defined
+in the [output mapping](/transformations/mappings/#output-mapping) are returned to Storage.
diff --git a/storage/files/index.md b/storage/files/index.md
index 7e2b757af..26f4ea416 100644
--- a/storage/files/index.md
+++ b/storage/files/index.md
@@ -57,7 +57,7 @@ Such a URL is valid for only one hour from the time of its generation --- the ti
 was shown to you, not when you clicked the link.
 
 **Important:** The URL itself does not require any other authorization.
-That is, you can send a link to non-public files to people without access to your Keboola Connection project and they
+That is, you can send a link to non-public files to people without access to your Keboola project and they
 will be able to download that file via the direct link. However, they will not be able to generate 
 or guess the link themselves.
 
@@ -82,5 +82,5 @@ In that case, the limit applies to the chunk size.
 
 As stated above, unless marked as permanent, each file will be automatically deleted 15 days after its creation. 
 This also applies to automatically generated files as a result of table imports and exports. 
-In addition, because the majority of Keboola Connection File Storage contains duplicates of your table data, 
+In addition, because the majority of Keboola File Storage contains duplicates of your table data, 
 the whole Files storage does not count towards your project quota.
diff --git a/storage/index.md b/storage/index.md
index 6ba00d388..0ff618ef6 100644
--- a/storage/index.md
+++ b/storage/index.md
@@ -8,13 +8,13 @@ permalink: /storage/
 
 *See our [Getting Started](/tutorial/load/) tutorial for instructions on how to use Storage.*
 
-As the central [Keboola Connection subsystem](/overview/), Storage manages everything related to **storing** data and **accessing** it.
+As the central [Keboola subsystem](/overview/), Storage manages everything related to **storing** data and **accessing** it.
 It is implemented as a layer on top of database engines that we use as our backends
 ([Snowflake](https://www.snowflake.com/), [Redshift](https://aws.amazon.com/redshift/)).
 By default all projects use the Snowflake backend as it is faster and more scalable. If, for some
 reason, you need to use the Redshift backend, contact our [support](/management/support).
 
-As with all other Keboola Connection components, everything that can be done through the UI can be also done programmatically
+As with all other Keboola components, everything that can be done through the UI can be also done programmatically
 via the [Storage API](https://keboola.docs.apiary.io/).
 See our [developers guide](https://developers.keboola.com/integrate/storage/) to learn more.
 Every Storage operation must be authorized via a [token](/management/project/tokens/).
@@ -22,7 +22,7 @@ It is also recorded in [Events](/management/project/tokens/#token-events) and
 [Jobs](/management/jobs/).
 
 ## Storage Data
-The Storage component manages all data stored in each Keboola Connection project:
+The Storage component manages all data stored in each Keboola project:
 
 - [Data tables](/storage/tables/) (Table Storage) --- organized into [buckets](/storage/buckets/)
 - [Data files](/storage/files/) (File Storage) --- all raw files uploaded to your project
@@ -34,7 +34,7 @@ for [File Storage](/storage/files/) and [Amazon Redshift](https://aws.amazon.com
 behind the Table Storage is referred to as a **backend**.
 
 Data in Table Storage is internally stored in a **database backend** (project backend). From the point of
-view of the Keboola Connection user, the only notable difference is that Snowflake allows 16MB table cell size while
+view of the Keboola user, the only notable difference is that Snowflake allows 16MB table cell size while
 Redshift is limited to 64kB table cell size.
 
 ### Redshift Table Size
diff --git a/storage/tables/csv-files.md b/storage/tables/csv-files.md
index e07b92dd1..405df8033 100644
--- a/storage/tables/csv-files.md
+++ b/storage/tables/csv-files.md
@@ -71,7 +71,7 @@ Notepad. Simply open the file, and without making any modifications, save it wit
 {: .image-popup}
 ![Screenshot -- Excel Export - Notepad Convert](/storage/tables/excel-export-2.png)
 
-The resulting file `import-data.txt.csv` can now be imported into Keboola Connection Storage as a tab delimited file.
+The resulting file `import-data.txt.csv` can now be imported into Keboola Storage as a tab delimited file.
 
 {: .image-popup}
 ![Screenshot -- Excel Export - KBC Import](/storage/tables/excel-export-3.png)
@@ -100,7 +100,7 @@ when asked about the file format).
 *Note: The rows are exported in random order and there is no way to specify ordering of rows in the exported file.*
 
 ### Opening in Microsoft Excel
-The easiest way to import the CSV file exported from Keboola Connection into Microsoft Excel is by starting Excel and opening 
+The easiest way to import the CSV file exported from Keboola into Microsoft Excel is by starting Excel and opening 
 a **blank workbook**. Then use the **Data** -- **From Text** function and select the exported file:
 
 {: .image-popup}
diff --git a/storage/tables/index.md b/storage/tables/index.md
index d52853869..f36b623eb 100644
--- a/storage/tables/index.md
+++ b/storage/tables/index.md
@@ -10,7 +10,7 @@ Your project *Table Storage* is available in the **Tables** tab in the Storage s
 All data tables are organized into [buckets](/storage/buckets/) that can also be
 used to [share tables](/catalog/) between projects.
 
-The actual data tables and the buckets are created primarily by Keboola Connection components (extractors, transformations
+The actual data tables and the buckets are created primarily by Keboola components (extractors, transformations
 and applications), or they are imported from CSV files. In case you want to import data to an already
 **existing table**, the imported table must have all the columns of the old, existing table, even if the old
 table is empty. If some columns are missing, you will receive a message like this:
diff --git a/templates/ai-sms-campaign/ai-sms-campaign.md b/templates/ai-sms-campaign/ai-sms-campaign.md
index f737649a5..e182e94ae 100644
--- a/templates/ai-sms-campaign/ai-sms-campaign.md
+++ b/templates/ai-sms-campaign/ai-sms-campaign.md
@@ -59,7 +59,7 @@ The following data destinations are available:
 The process is simple. We will guide you through it, and, when needed, ask you to provide your credentials and authorize the destination component.
 
 First decide which data source and which data destination you want to use. Then select the corresponding template 
-from the **Templates** tab in your Keboola Connection project. When you are done, click **+ Use Template**.
+from the **Templates** tab in your Keboola project. When you are done, click **+ Use Template**.
 
 {: .image-popup}
 ![Add New Template](/templates/ai-sms-campaign/add-new-template.png)
diff --git a/templates/customer-relationship-management/customer-relationship-management.md b/templates/customer-relationship-management/customer-relationship-management.md
index 94c822f1b..66b763853 100644
--- a/templates/customer-relationship-management/customer-relationship-management.md
+++ b/templates/customer-relationship-management/customer-relationship-management.md
@@ -7,7 +7,7 @@ permalink: /templates/customer-relationship-management/
 {:toc}
 
 
-With this end-to-end flow you can extract your updated data from your CRM tool (Salesforce, PipeDrive) and bring it into Keboola Connection. 
+With this end-to-end flow you can extract your updated data from your CRM tool (Salesforce, PipeDrive) and bring it into Keboola. 
 After all the necessary tasks are performed on the data, you can transform the results into visualizations in any BI tool of your choice.
 By using our CRM template, you will get an overview about your customers, activities, and opportunities for potential sales across the pipeline.
 
@@ -56,7 +56,7 @@ These data destinations are available in Public Beta:
 ## How to Use Template
 The process is simple. We will guide you through it, and, when needed, ask you to provide your credentials and authorize the destination component.
 
-First decide which data source and which data destination you want to use. Then select the corresponding template from the **Templates** tab in your Keboola Connection project. When you are done, click **+ Use Template**.
+First decide which data source and which data destination you want to use. Then select the corresponding template from the **Templates** tab in your Keboola project. When you are done, click **+ Use Template**.
 
 {: .image-popup}
 ![Add New Template](/templates/customer-relationship-management/add-new-template.png)
@@ -125,7 +125,7 @@ A detailed guide is available [here](https://help.keboola.com/components/writers
 
 Authorize your Google account.
 
-Duplicate the sheet into your Google Drive and paste the file ID back to Keboola Connection. It is needed for correct mapping 
+Duplicate the sheet into your Google Drive and paste the file ID back to Keboola. It is needed for correct mapping 
 in your duplicated Google sheet. 
 
 ### Snowflake Database Provided by Keboola
diff --git a/templates/data-quality/data-quality.md b/templates/data-quality/data-quality.md
index 360ae47e3..a688680ff 100644
--- a/templates/data-quality/data-quality.md
+++ b/templates/data-quality/data-quality.md
@@ -81,7 +81,7 @@ These are the available tests:
 ## How to Use Template
 The process is simple. You don't need to configure anything. Just add the template to your project and then run it. Shared codes will be added to your project, and all steps of the flow will be executed in order to generate a sample SQL transformation, using the data tests and generating the result log table. 
 
-Select the corresponding template from the **Templates** tab in your Keboola Connection project. When you are done, click **+ Use Template**.
+Select the corresponding template from the **Templates** tab in your Keboola project. When you are done, click **+ Use Template**.
 
 {: .image-popup}
 ![Add New Template](/templates/data-quality/add-new-template.png)
diff --git a/templates/datahub/datahub.md b/templates/datahub/datahub.md
index 531202464..7c89785dd 100644
--- a/templates/datahub/datahub.md
+++ b/templates/datahub/datahub.md
@@ -56,8 +56,8 @@ Make sure that you replace the username and duration above. Copy the token that
 ![DataHub Flow](/templates/datahub/datahub-flow.png)
 
 - First, the Metadata and Telemetry source components (extractors) will collect the data from your project or organization.
-    - The Telemetry extractor allows you to retrieve data pertaining to project or your entire organization. It helps you monitor the activities and usage of your Keboola Connection projects. It also helps Keboola calculate your project consumption.
-    - The Metadata extractor downloads information from Keboola's APIs pertaining to various objects, users, etc. The metadata obtained by this source component can be used in addition with the default telemetry data pertaining to Keboola Connection projects to provide even more insights into the telemetry of your organization.
+    - The Telemetry extractor allows you to retrieve data pertaining to project or your entire organization. It helps you monitor the activities and usage of your Keboola projects. It also helps Keboola calculate your project consumption.
+    - The Metadata extractor downloads information from Keboola's APIs pertaining to various objects, users, etc. The metadata obtained by this source component can be used in addition with the default telemetry data pertaining to Keboola projects to provide even more insights into the telemetry of your organization.
 
 - In the transformations,  a single metadata table is created for transmitting information to DataHub. Lineage is also calculated by parsing component configurations. 
 
diff --git a/templates/ecomm-kpi-dashboard/ecomm-kpi-dashboard.md b/templates/ecomm-kpi-dashboard/ecomm-kpi-dashboard.md
index 20707b9dc..b4f602567 100644
--- a/templates/ecomm-kpi-dashboard/ecomm-kpi-dashboard.md
+++ b/templates/ecomm-kpi-dashboard/ecomm-kpi-dashboard.md
@@ -13,7 +13,7 @@ The dashboards display a comparison between planned numbers and the actual situa
 enabling **seamless integration with Slack** for quick communication. 
 
 With all your data centralized in a single table and location, the need for manual data collection across multiple systems is eliminated, 
-thanks to the automated capabilities of Keboola Connection. Simplify your data management with ease.
+thanks to the automated capabilities of Keboola. Simplify your data management with ease.
 
 {: .image-popup}
 ![Required Configuration](/templates/ecomm-kpi-dashboard/required-config.png)
@@ -66,7 +66,7 @@ The following data destination is available:
 The process is simple. We will guide you through it, and, when needed, ask you to provide your credentials and authorize the source and destination components.
 
 First decide which data source and which data destination you want to use. Then select the corresponding template from the **Templates** tab 
-in your Keboola Connection project. When you are done, click **+ Use Template**.
+in your Keboola project. When you are done, click **+ Use Template**.
 
 {: .image-popup}
 ![Add New Template](/templates/ecomm-kpi-dashboard/add-new-template.png)
diff --git a/templates/ecommerce/ecommerce.md b/templates/ecommerce/ecommerce.md
index f34874151..4625c22e2 100644
--- a/templates/ecommerce/ecommerce.md
+++ b/templates/ecommerce/ecommerce.md
@@ -6,7 +6,7 @@ permalink: /templates/ecommerce/
 * TOC
 {:toc}
 
-With this end-to-end flow you can extract your updated data from an eCommerce platform and bring it into Keboola Connection. 
+With this end-to-end flow you can extract your updated data from an eCommerce platform and bring it into Keboola. 
 After all the necessary tasks are performed on the data, you can transform the results into visualizations in any BI tool of your choice.
 
 **The flow, in a nutshell:**
@@ -79,7 +79,7 @@ The following data destinations will be coming soon:
 ## How to Use Template
 The process is simple. We will guide you through it, and, when needed, ask you to provide your credentials and authorize the destination component.
 
-First decide which Data Source and which Data Destination you want to use. Then select the corresponding template from the **Templates** tab in your Keboola Connection project. When you are done, click **+ Use Template**. 
+First decide which Data Source and which Data Destination you want to use. Then select the corresponding template from the **Templates** tab in your Keboola project. When you are done, click **+ Use Template**. 
 
 {: .image-popup}
 ![Add New Use Case](/templates/ecommerce/add-new-template.png)
@@ -180,7 +180,7 @@ Using the following marketing data sources is optional. Select the ones you wish
 {: .image-popup}
 ![Facebook Ads Data Source](/templates/ecommerce/facebook-ads-data-source.png)
 
-Log into Facebook with redirection from this step and allow Keboola Connection to access the data. 
+Log into Facebook with redirection from this step and allow Keboola to access the data. 
 
 From the list of accounts select the accounts from which you want to download data.
 
@@ -224,7 +224,7 @@ A detailed guide is available [here](https://help.keboola.com/components/writers
 
 Authorize your Google account.
 
-Duplicate the sheet into your Google Drive and paste the file ID back into Keboola Connection. This is needed to achieve correct mapping in your duplicated Google sheet. 
+Duplicate the sheet into your Google Drive and paste the file ID back into Keboola. This is needed to achieve correct mapping in your duplicated Google sheet. 
 
 <!-- *Note: We are working on automatization. In the future, you won't have to duplicate the sheet by yourself---we will do that for you.* -->
 
diff --git a/templates/google-analytics/google-analytics.md b/templates/google-analytics/google-analytics.md
index 27a69ffc1..1005c5580 100644
--- a/templates/google-analytics/google-analytics.md
+++ b/templates/google-analytics/google-analytics.md
@@ -58,7 +58,7 @@ These data destinations are available in Public Beta:
 The process is simple. We will guide you through it, and, when needed, ask you to provide your credentials and authorize the destination component.
 
 First decide which data source and which data destination you want to use. Then select the corresponding template 
-from the **Templates** tab in your Keboola Connection project. When you are done, click **+ Use Template**.
+from the **Templates** tab in your Keboola project. When you are done, click **+ Use Template**.
 
 {: .image-popup}
 ![Add New Template](/templates/google-analytics/add-new-template.png)
@@ -132,7 +132,7 @@ A detailed guide is available [here](https://help.keboola.com/components/writers
 
 Authorize your Google account.
 
-Duplicate the sheet into your Google Drive and paste the file ID back to Keboola Connection. It is needed for correct mapping 
+Duplicate the sheet into your Google Drive and paste the file ID back to Keboola. It is needed for correct mapping 
 in your duplicated Google sheet. 
 
 <!-- 
diff --git a/templates/interactive-keboola-sheets/interactive-keboola-sheets.md b/templates/interactive-keboola-sheets/interactive-keboola-sheets.md
index 2407988e1..b1113c7c3 100644
--- a/templates/interactive-keboola-sheets/interactive-keboola-sheets.md
+++ b/templates/interactive-keboola-sheets/interactive-keboola-sheets.md
@@ -7,7 +7,7 @@ permalink: /templates/interactive-keboola-sheets/
 {:toc}
 
 This template will help you simplify data editing and management within your company. 
-The data app eliminates the need to export data to external tools, allowing business users to **directly access and edit tables stored in Keboola Connection Storage**.
+The data app eliminates the need to export data to external tools, allowing business users to **directly access and edit tables stored in Keboola Storage**.
 
 By centralizing data editing, the app enhances collaboration, reduces errors, and streamlines your data management processes. 
 Replace manual data manipulation with a seamless data editing solution. Utilizing this template will provide you with a **more efficient** and **user-friendly** 
@@ -29,13 +29,13 @@ In the **Secrets** section, insert the token(s) of the bucket(s) you want to mak
 - Specify the field/column limitations within the Python code of the app.
 - Deploy the app. 
 - Within the data app, business users can select a table for editing.
-- After completing the edits, click **Save Changes**, and the changes will instantly be saved back into the table in Keboola Connection Storage.
+- After completing the edits, click **Save Changes**, and the changes will instantly be saved back into the table in Keboola Storage.
 
 ## How to Use the Template
 The process is simple. We will guide you through it, and, when needed, ask you to provide your credentials and authorize the destination component.
 
 First decide which data source and which data destination you want to use. Then select the corresponding template from the **Templates** tab 
-in your Keboola Connection project. When you are done, click **+ Use Template**.
+in your Keboola project. When you are done, click **+ Use Template**.
 
 {: .image-popup}
 ![Add New Template](/templates/interactive-keboola-sheets/add-new-template.png)
@@ -62,5 +62,5 @@ Whether you are a data analyst, scientist, or anyone working with data, this too
 - **Edit your data:** Once your table is loaded, you will see it displayed in an editable table format. You can easily make changes, add new data, or remove rows.
 - **Save your changes:** When you are satisfied with your edits, simply click the **Send to Keboola** button. Your changes will then be saved, and the updated data will be sent back to your Keboola Storage.
 
-It is that simple! This app streamlines the process of editing and managing your data in Keboola Connection. Whether you need to clean, transform, or update your datasets, this tool helps you do it efficiently. Happy data editing!
+It is that simple! This app streamlines the process of editing and managing your data in Keboola. Whether you need to clean, transform, or update your datasets, this tool helps you do it efficiently. Happy data editing!
 
diff --git a/templates/kai-promptlab/kai-promptlab.md b/templates/kai-promptlab/kai-promptlab.md
index 28f5adf51..dff0c7607 100644
--- a/templates/kai-promptlab/kai-promptlab.md
+++ b/templates/kai-promptlab/kai-promptlab.md
@@ -15,12 +15,12 @@ users can quickly identify which prompts yield the best results, streamlining th
 **The flow, in a nutshell:**
 
 The template contains one flow only. It consists of a single component, a data app that serves as an interface for the user. The app is connected to 
-a specific bucket/table within Keboola Connection via an API and provides the option for query tuning.
+a specific bucket/table within Keboola via an API and provides the option for query tuning.
 
 ## How to Use Template
 The process is simple. We will guide you through it. 
 
-First, select the corresponding template (Kay PromptLab) from the **Templates** tab in your Keboola Connection project. When you are done, click **+ Use Template.**
+First, select the corresponding template (Kay PromptLab) from the **Templates** tab in your Keboola project. When you are done, click **+ Use Template.**
 
 {: .image-popup}
 ![Add New Template](/templates/kai-promptlab/add-new-template.png)
@@ -55,7 +55,7 @@ by clicking the **Open Data App** button.
 ![Add Data App](/templates/kai-promptlab/add-data-app.png)
 
 Upon launching the data app, you will be prompted to enter the OpenAI API Key, which you can generate in your OpenAI account. 
-To authenticate, you will also need to enter your Keboola API token, which can be found in your **Account Settings** in the Keboola Connection platform. 
+To authenticate, you will also need to enter your Keboola API token, which can be found in your **Account Settings** in the Keboola platform. 
 
 For more information about Keboola API tokens, please refer to the [documentation](https://help.keboola.com/management/project/tokens/). 
 Once you have entered both required API tokens, click **Connect**. 
diff --git a/templates/mailchimp/mailchimp.md b/templates/mailchimp/mailchimp.md
index 149a81ae4..70a6b400e 100644
--- a/templates/mailchimp/mailchimp.md
+++ b/templates/mailchimp/mailchimp.md
@@ -32,7 +32,7 @@ With this end-to-end flow you can extract data from MailChimp and transform it i
 The process is simple. We will guide you through it, and, when needed, ask you to provide your credentials and authorize the destination component.
 
 First decide which data source and which data destination you want to use. Then select the corresponding template 
-from the **Templates** tab in your Keboola Connection project. When you are done, click **+ Use Template**.
+from the **Templates** tab in your Keboola project. When you are done, click **+ Use Template**.
 
 {: .image-popup}
 ![Add New Template](/templates/mailchimp/add-new-template.png)
@@ -110,7 +110,7 @@ A detailed guide is available [here](https://help.keboola.com/components/writers
 
 Authorize your Google account.
 
-Duplicate the sheet into your Google Drive and paste the file ID back to Keboola Connection. It is needed for correct mapping 
+Duplicate the sheet into your Google Drive and paste the file ID back to Keboola. It is needed for correct mapping 
 in your duplicated Google sheet. 
 
 <!-- 
diff --git a/templates/marketing-platforms/marketing-platforms.md b/templates/marketing-platforms/marketing-platforms.md
index 243620277..729881d10 100644
--- a/templates/marketing-platforms/marketing-platforms.md
+++ b/templates/marketing-platforms/marketing-platforms.md
@@ -7,9 +7,9 @@ permalink: /templates/marketing-platforms/
 {:toc}
 
 Using one of the advertising platform templates will give you an overview of the costs of all of your campaigns in the marketing channels you use. All data will be stored in one table 
-and one location. That means that you won't have to go to multiple systems and collect data manually anymore. Keboola Connection will do it for you.
+and one location. That means that you won't have to go to multiple systems and collect data manually anymore. Keboola will do it for you.
 
-With this end-to-end flow you can bring into Keboola Connection data from one or more marketing channels of your choice (Facebook Ads, LinkedIn Ads, Google Ads, 
+With this end-to-end flow you can bring into Keboola data from one or more marketing channels of your choice (Facebook Ads, LinkedIn Ads, Google Ads, 
 and Bing Ads). After all the necessary tasks are performed on the data, you load the results into Snowflake, Google BigQuery or Google Sheets. You can also enrich the data with Google Analytics.
 
 **The flow, in a nutshell:**
@@ -85,7 +85,7 @@ The following data destinations will be coming soon:
 The process is simple. We will guide you through it, and, when needed, ask you to provide your credentials and authorize the destination component.
 
 First decide which data source and which data destination you want to use. Then select the corresponding template 
-from the **Templates** tab in your Keboola Connection project. When you are done, click **+ Use Template**.
+from the **Templates** tab in your Keboola project. When you are done, click **+ Use Template**.
 
 {: .image-popup}
 ![Add New Template](/templates/marketing-platforms/add-new-template.png)
@@ -157,7 +157,7 @@ You need to use at least one of the following marketing data sources. In additio
 {: .image-popup}
 ![Facebook Ads Data Source](/templates/marketing-platforms/facebook-ads-data-source.png)
 
-Log into Facebook with redirection from this step and allow Keboola Connection to access the data. 
+Log into Facebook with redirection from this step and allow Keboola to access the data. 
 
 From the list of accounts select the accounts from which you want to download data.
 
@@ -211,7 +211,7 @@ A detailed guide is available [here](https://help.keboola.com/components/writers
 
 Authorize your Google account.
 
-Duplicate the sheet into your Google Drive and paste the file ID back to Keboola Connection. It is needed for correct mapping 
+Duplicate the sheet into your Google Drive and paste the file ID back to Keboola. It is needed for correct mapping 
 in your duplicated Google sheet. 
 
 <!-- 
diff --git a/templates/media-cashflow/media-cashflow.md b/templates/media-cashflow/media-cashflow.md
index 9b5935bbb..f90f7f182 100644
--- a/templates/media-cashflow/media-cashflow.md
+++ b/templates/media-cashflow/media-cashflow.md
@@ -70,7 +70,7 @@ To use a selected data source component, you must first authorize the data sourc
 {: .image-popup}
 ![Facebook Ads Data Source](/templates/media-cashflow/fb-ads-source.png)
 
-Log in to Facebook with redirection from this step, and allow Keboola Connection to access the data.
+Log in to Facebook with redirection from this step, and allow Keboola to access the data.
 From the list of accounts, select the accounts from which you want to download data.
 
 ### Google Ads
diff --git a/templates/project-management/project-management.md b/templates/project-management/project-management.md
index 37a518c88..74cd29e70 100644
--- a/templates/project-management/project-management.md
+++ b/templates/project-management/project-management.md
@@ -7,7 +7,7 @@ permalink: /templates/project-management/
 {:toc}
 
 
-With this end-to-end flow you can extract your updated data from your project management tool and bring it into Keboola Connection. 
+With this end-to-end flow you can extract your updated data from your project management tool and bring it into Keboola. 
 After all the necessary tasks are performed on the data, you can transform the results into visualizations in any BI tool of your choice.
 By using our project management template, you will get an overview across all projects, their epics, tasks, users, and their actions.
 
@@ -60,7 +60,7 @@ These data destinations are available in Public Beta:
 ## How to Use Template
 The process is simple. We will guide you through it, and, when needed, ask you to provide your credentials and authorize the destination component.
 
-First decide which data source and which data destination you want to use. Then select the corresponding template from the **Templates** tab in your Keboola Connection project. When you are done, click **+ Use Template**.
+First decide which data source and which data destination you want to use. Then select the corresponding template from the **Templates** tab in your Keboola project. When you are done, click **+ Use Template**.
 
 {: .image-popup}
 ![Add New Template](/templates/project-management/add-new-template.png)
@@ -134,7 +134,7 @@ A detailed guide is available [here](https://help.keboola.com/components/writers
 
 Authorize your Google account.
 
-Duplicate the sheet into your Google Drive and paste the file ID back to Keboola Connection. It is needed for correct mapping 
+Duplicate the sheet into your Google Drive and paste the file ID back to Keboola. It is needed for correct mapping 
 in your duplicated Google sheet. 
 
 ### PostgreSQL Database
diff --git a/templates/repository/repository.md b/templates/repository/repository.md
index 8225ccb43..7f3e82d40 100644
--- a/templates/repository/repository.md
+++ b/templates/repository/repository.md
@@ -6,7 +6,7 @@ permalink: /templates/repository/
 * TOC
 {:toc}
 
-With this end-to-end flow you can extract your updated data from your repository tool (GitHub) and bring it into Keboola Connection. 
+With this end-to-end flow you can extract your updated data from your repository tool (GitHub) and bring it into Keboola. 
 After all the necessary tasks are performed on the data, you can transform the results into visualizations in any BI tool of your choice.
 
 By using our repository template, you will get an overview of your repositories and the activity in them.
@@ -58,7 +58,7 @@ These data destinations are available in Public Beta:
 ## How to Use Template
 The process is simple. We will guide you through it, and, when needed, ask you to provide your credentials and authorize the destination component.
 
-First decide which data source and which data destination you want to use. Then select the corresponding template from the **Templates** tab in your Keboola Connection project. When you are done, click **+ Use Template**.
+First decide which data source and which data destination you want to use. Then select the corresponding template from the **Templates** tab in your Keboola project. When you are done, click **+ Use Template**.
 
 {: .image-popup}
 ![Add New Template](/templates/repository/add-new-template.png)
@@ -121,7 +121,7 @@ A detailed guide is available [here](https://help.keboola.com/components/writers
 
 Authorize your Google account.
 
-Duplicate the sheet into your Google Drive and paste the file ID back to Keboola Connection. It is needed for correct mapping 
+Duplicate the sheet into your Google Drive and paste the file ID back to Keboola. It is needed for correct mapping 
 in your duplicated Google sheet. 
 
 ### Snowflake Database Provided by Keboola
diff --git a/templates/social-media-engagement/social-media-engagement.md b/templates/social-media-engagement/social-media-engagement.md
index f22a5c10f..c6489776d 100644
--- a/templates/social-media-engagement/social-media-engagement.md
+++ b/templates/social-media-engagement/social-media-engagement.md
@@ -85,7 +85,7 @@ These data destinations are available (click the links for detailed documentatio
 The process is simple. We will guide you through it, and, when needed, ask you to provide your credentials and authorize the destination component.
 
 First decide which data source and which data destination you want to use. Then select the corresponding template 
-from the **Templates** tab in your Keboola Connection project. When you are done, click **+ Use Template**.
+from the **Templates** tab in your Keboola project. When you are done, click **+ Use Template**.
 
 {: .image-popup}
 ![Add New Template](/templates/social-media-engagement/add-new-template.png)
@@ -175,7 +175,7 @@ A detailed guide is available [here](https://help.keboola.com/components/writers
 
 Authorize your Google account.
 
-Duplicate the sheet into your Google Drive and paste the file ID back to Keboola Connection. It is needed for correct mapping 
+Duplicate the sheet into your Google Drive and paste the file ID back to Keboola. It is needed for correct mapping 
 in your duplicated Google sheet. 
 
 <!-- 
diff --git a/templates/surveys/surveys.md b/templates/surveys/surveys.md
index 713f35410..145c70413 100644
--- a/templates/surveys/surveys.md
+++ b/templates/surveys/surveys.md
@@ -6,7 +6,7 @@ permalink: /templates/surveys/
 * TOC
 {:toc}
 
-With this end-to-end flow you can extract your updated data from your project survey tool (Typeform) and bring it into Keboola Connection. 
+With this end-to-end flow you can extract your updated data from your project survey tool (Typeform) and bring it into Keboola. 
 After all the necessary tasks are performed on the data, you can transform the results into visualizations in any BI tool of your choice.
 
 By using our survey template, you will get an overview of all your surveys, questions, and responses.
@@ -52,7 +52,7 @@ These data destinations are available in Public Beta:
 ## How to Use Template
 The process is simple. We will guide you through it, and, when needed, ask you to provide your credentials and authorize the destination component.
 
-First decide which data source and which data destination you want to use. Then select the corresponding template from the **Templates** tab in your Keboola Connection project. When you are done, click **+ Use Template**.
+First decide which data source and which data destination you want to use. Then select the corresponding template from the **Templates** tab in your Keboola project. When you are done, click **+ Use Template**.
 
 {: .image-popup}
 ![Add New Template](/templates/surveys/add-new-template.png)
@@ -115,7 +115,7 @@ A detailed guide is available [here](https://help.keboola.com/components/writers
 
 Authorize your Google account.
 
-Duplicate the sheet into your Google Drive and paste the file ID back to Keboola Connection. It is needed for correct mapping 
+Duplicate the sheet into your Google Drive and paste the file ID back to Keboola. It is needed for correct mapping 
 in your duplicated Google sheet. 
 
 ### Snowflake Database Provided by Keboola
diff --git a/templates/templates.md b/templates/templates.md
index 42cd51dc9..d5ae5ef18 100644
--- a/templates/templates.md
+++ b/templates/templates.md
@@ -10,7 +10,7 @@ Data templates are pre-defined sets of [component configurations](/components/).
 by an [orchestration](/orchestrator/) and [metadata](/storage/tables/#metadata). Together they form a functional reusable block
 that solves a specific problem. 
 
-Keboola Connection is a very open [platform](/overview), which may be overwhelming in many cases. 
+Keboola is a very open [platform](/overview), which may be overwhelming in many cases. 
 The goal of data templates is to make the configuration of repeated (or repeatable) solutions easy. 
 Although they are pre-defined sets of configurations, the created configurations have no special properties and 
 can be modified like any other configuration you have [created manually](/components/#creating-component-configuration).
diff --git a/transformations/bigquery/index.md b/transformations/bigquery/index.md
index a9dc769a4..26144f44f 100644
--- a/transformations/bigquery/index.md
+++ b/transformations/bigquery/index.md
@@ -21,7 +21,7 @@ permalink: /transformations/bigquery/
 
 BigQuery is designed for flexibility and ease of use. Its integration with other Google Cloud services provides a robust platform for analytics at scale. To keep up with the latest improvements and updates, it's a good idea to monitor the [BigQuery release notes](https://cloud.google.com/bigquery/docs/release-notes).
 
-For information on BigQuery limitations within Keboola Connection, refer to the [BigQuery Limitations](/storage/byodb/#bigquery-limitations) section.
+For information on BigQuery limitations within Keboola, refer to the [BigQuery Limitations](/storage/byodb/#bigquery-limitations) section.
 
 ## Aborting Transformation Execution
 In some cases, you may need to abort the transformation execution and exit with an error message. 
diff --git a/transformations/code-patterns/index.md b/transformations/code-patterns/index.md
index 4895f251e..113846dfd 100644
--- a/transformations/code-patterns/index.md
+++ b/transformations/code-patterns/index.md
@@ -13,7 +13,7 @@ Code Pattern is a special type of [component](/components/) that
 
 ## List of Code Patterns
 
-All components published with **Code Pattern** can be found in the Keboola Connection 
+All components published with **Code Pattern** can be found in the Keboola 
 [Developer Portal](https://components.keboola.com/components). To find out which transformation types a component can be used for, read its description.
 
 {: .image-popup}
@@ -83,7 +83,7 @@ Below you can see an example mapping. It was generated by the `Snapshot - SCD` c
 ### Parameters Form
 
 The parameters determine the content of the generated code.
-The form is generated dynamically based on the component specification in the Keboola Connection 
+The form is generated dynamically based on the component specification in the Keboola 
 [Developer Portal](https://components.keboola.com/components). Remember to save your changes.
 
 {: .image-popup}
diff --git a/transformations/dbt/cli/cli.md b/transformations/dbt/cli/cli.md
index 9cbba1b3f..6550d58fe 100644
--- a/transformations/dbt/cli/cli.md
+++ b/transformations/dbt/cli/cli.md
@@ -8,7 +8,7 @@ Video:
 
 ## Local Development
 
-Let's set up the local development with [Keboola Connection CLI](https://developers.keboola.com/cli/).
+Let's set up the local development with [Keboola CLI](https://developers.keboola.com/cli/).
 
 It is easy on Mac with [homebrew](https://docs.brew.sh/Installation.html) support (other platforms covered in the [documentation](https://developers.keboola.com/cli/installation/)):
 
@@ -27,13 +27,13 @@ kbc --version
 
 ![](imgs/2772467715.png){: width="100%" }
 
-**You will then gain access to dbt-related commands within Keboola Connection (KBC) CLI!**
+**You will then gain access to dbt-related commands within Keboola CLI!**
 
 ### Steps
 
 **initial setup**
 
-You must have a KBC project, a cloned git repository with a dbt project, and the dbt binary installed.
+You must have a Keboola project, a cloned git repository with a dbt project, and the dbt binary installed.
 
 The user is in the folder with the cloned dbt project and can run the following commands.
 
@@ -152,7 +152,7 @@ dbt run -t beer_demo  --profiles-dir .
 
 *   Universal support to manage workspaces
 
-*   Hide `keboola.sandboxes` configurations from the KBC project folder structure.
+*   Hide `keboola.sandboxes` configurations from the Keboola project folder structure.
 
 
 ### `kbc remote workspace create`
diff --git a/transformations/dbt/flows/flows.md b/transformations/dbt/flows/flows.md
index f2537e830..19543ae94 100644
--- a/transformations/dbt/flows/flows.md
+++ b/transformations/dbt/flows/flows.md
@@ -3,7 +3,7 @@ title: Usage in Flows
 permalink: /transformations/dbt/flows/
 ---
 
-All dbt related components behave in the same way as any other component in Keboola Connection does. They can be added to the flows to define orchestrated data pipelines, add schedule and notifications:
+All dbt related components behave in the same way as any other component in Keboola does. They can be added to the flows to define orchestrated data pipelines, add schedule and notifications:
 
 ![](imgs/2776269000.jpeg){: width="100%" }
 
diff --git a/transformations/index.md b/transformations/index.md
index dd6c1b134..aece136d4 100644
--- a/transformations/index.md
+++ b/transformations/index.md
@@ -8,14 +8,14 @@ redirect_from:
 * TOC
 {:toc}
 
-*To create your first transformation, and to see how Transformations are an integral part of the Keboola Connection 
-workflow, go to our [Getting Started tutorial](/tutorial/manipulate/).*
+*To create your first transformation, and to see how transformations are an integral part of the Keboola workflow, 
+go to our [Getting Started tutorial](/tutorial/manipulate/).*
 
 **Transformations** allow you to manipulate data in your project. They are the tasks you want to perform
 (Marketing data preaggregation, Tableau denormalizer, Integrity checker or Join marketing channels
 and sales, etc.). 
 
-In Keboola Connection all Transformations operate on a copy of the data from Storage
+In Keboola all transformations operate on a copy of the data from Storage
 in a safe and isolated environment. This improves safety, repeatability and traceability of all data operations.
 The process of isolating data is called [**mapping**](/transformations/mappings/).
 The mapping process copies input data from permanent project Storage into a 
@@ -35,14 +35,14 @@ A transformation is represented by a **Transformation Script** (SQL, Julia, Open
 can use to manipulate your data. To ensure safety of the data in Storage, a transformation
 operates in a completely separate **staging storage** created for each transformation. When a
 transformation [job](/management/jobs/) runs, it takes the required data from the project [Storage](/storage/tables/) 
-and copies them to a temporary staging storage. This process is called [**Input Mapping**](/transformations/mappings/). 
+and copies them to a temporary staging storage. This process is called [**input mapping**](/transformations/mappings/). 
 The transformation job then runs the transformation script operating on the staging storage.
-When the transformation is finished, the **Output Mapping** process moves the transformation results back to
-the designated tables in Storage. The **Input** and **Output** mappings ensure complete safety of
+When the transformation is finished, the **output mapping** process moves the transformation results back to
+the designated tables in Storage. The **input** and **output** mappings ensure complete safety of
 the transformation processes -- the transformation always operates in an isolated workspace.
 
 ## Mapping
-[**Input and Output Mapping**](/transformations/mappings/) --- separates the source data from your transformation. 
+[**Input and output mapping**](/transformations/mappings/) --- separates the source data from your transformation. 
 Mapping creates a secure staging area with data copied from the [Storage tables](/storage/tables/) specified in the 
 input mappings. Database table names and CSV file names in transformations are completely unrelated to names of tables 
 in Storage. This means, for example, that you can rename tables in storage and it won't break any of your transformations.
@@ -58,7 +58,7 @@ The transformations are very flexible, though all the combinations might not be
 
 ## Backends
 The  **Transformation Script** is a code that defines what happens with the data while taking the
-tables from Input Mapping, modifying them and producing the tables referenced in Output Mapping.
+tables from input mapping, modifying them and producing the tables referenced in output mapping.
 
 A backend is the engine running the transformation script. It is either a database server
 ([Amazon Redshift](https://aws.amazon.com/redshift/),
@@ -312,7 +312,7 @@ standard [API](https://developers.keboola.com/integrate/storage/api/configuratio
 and run configurations and that it is possible to create your own 
 [transformation components](https://developers.keboola.com/extend/component/).
 
-New Transformations support [sharing pieces of code](/transformations/variables/#shared-code), 
+New transformations support [sharing pieces of code](/transformations/variables/#shared-code), 
 encouraging users to create reusable blocks of code. They also support 
 [Variables](/transformations/variables/#variables) that can be used to parametrize transformations.
 
@@ -346,7 +346,7 @@ Currently, it supports autocompletion of:
 - Language specific reserved words
 - `SELECT`, `UPDATE`, etc. in SQL transformations
 - `import`, `while`, etc. in Python transformations
-- Tables you added to Input Mapping or Output Mapping
+- Tables you added to input mapping or output mapping
 - When working with Python or R transformations, a relative path will be suggested (e.g., `in/tables/cars.csv`).
 - Variables you defined in your transformation (also with values)
 
@@ -359,12 +359,12 @@ When triggered
 - in other cases, it will suggest everything (see the screenshot above).
 
 ### Legacy Transformations
-Legacy Transformations are the current version of transformations available in most projects
+Legacy transformations are the current version of transformations available in most projects
 in the US and EU stacks. Each transformation bucket can contain any number of individual transformations.
 It should represent a logical set of operations you want to perform together.
 
 Though marked as legacy, they are perfectly okay to be used for daily work, since they still receive updates, 
-just no new features. Legacy Transformations are grouped into folders called **Transformation buckets**.
+just no new features. Legacy transformations are grouped into folders called **transformation buckets**.
 
 If you want to maintain the best forward compatibility, we recommend not to make complicated structures of phases 
 and dependencies.
diff --git a/transformations/julia/index.md b/transformations/julia/index.md
index 0781de3aa..fa162277a 100644
--- a/transformations/julia/index.md
+++ b/transformations/julia/index.md
@@ -41,7 +41,7 @@ The Julia script itself will be compiled to `/data/script.jl`. To access your in
 relative (`in/tables/file.csv`, `out/tables/file.csv`) or absolute (`/data/in/tables/file.csv`, `/data/out/tables/file.csv`) paths.
 To access downloaded files, use the `in/files/` or `/data/in/files/` path. If you want to dig really deep,
 have a look at the [full Common Interface specification](https://developers.keboola.com/extend/common-interface/).
-Temporary files can be written to a `/tmp/` folder. Do not use the `/data/` folder for files you do not wish to exchange with Keboola Connection.
+Temporary files can be written to a `/tmp/` folder. Do not use the `/data/` folder for files you do not wish to exchange with Keboola.
 
 ### Packages
 You can list extra packages in the UI. These packages are installed using the [General package registry](https://github.com/JuliaRegistries/General).
diff --git a/transformations/mappings/index.md b/transformations/mappings/index.md
index 05f563549..f6e211cd4 100644
--- a/transformations/mappings/index.md
+++ b/transformations/mappings/index.md
@@ -30,7 +30,7 @@ They are deleted from the transformation staging area when the execution finishe
 {: .image-popup}
 ![Simple input and output mapping](/transformations/mappings/mappings.png)
 
-*Table names referenced by mappings are automatically quoted by Keboola Connection. 
+*Table names referenced by mappings are automatically quoted by Keboola. 
 This is especially important for Snowflake, which is case sensitive.*
 
 ## Overview
@@ -180,7 +180,7 @@ As you can see, a **read-only input mapping** allows you to read a table created
 
 #### _timestamp system column
 A table loaded using `CLONE` will contain all columns of the original table plus a new `_timestamp` column.
-This column is used internally by Keboola Connection for comparison with the value of the *Changed in last* filter. 
+This column is used internally by Keboola for comparison with the value of the *Changed in last* filter. 
 
 The value in the column contains a unix timestamp of the [last change of the row](/storage/tables/#manual-incremental-processing). 
 You can use this column to set up [incremental processing](/storage/tables/#incremental-processing),
diff --git a/transformations/ml-model-deployment/index.md b/transformations/ml-model-deployment/index.md
index b54500939..a85877296 100644
--- a/transformations/ml-model-deployment/index.md
+++ b/transformations/ml-model-deployment/index.md
@@ -150,7 +150,7 @@ if __name__ == "__main__":
 {: .image-popup}
 ![Screenshot - Sample Code](/transformations/ml-model-deployment/05-sample-code.png)
 
-Once you train your model and run the first experiment, you can go back to the Keboola Connection UI, 
+Once you train your model and run the first experiment, you can go back to the Keboola UI, 
 open the MLflow UI from there, and check the results.
 
 {: .image-popup}
@@ -161,7 +161,7 @@ MLflow provides [predefined stages](https://mlflow.org/docs/latest/model-registr
 for common use cases such as Staging, Production, or Archived. 
 You can transition a model version from one stage to another stage.
 
-Once ready, go back to the tab **ML/AI services** in the Keboola Connection UI and deploy the model. 
+Once ready, go back to the tab **ML/AI services** in the Keboola UI and deploy the model. 
 
 ### Existing ML Model
 If there are already any models available (perhaps created by someone else before you), simply go to 
diff --git a/transformations/python-plain/index.md b/transformations/python-plain/index.md
index f39488666..da254c743 100644
--- a/transformations/python-plain/index.md
+++ b/transformations/python-plain/index.md
@@ -25,7 +25,7 @@ The Python script itself will be compiled to `/data/script.py`. To access your
 relative (`in/tables/file.csv`, `out/tables/file.csv`) or absolute (`/data/in/tables/file.csv`, `/data/out/tables/file.csv`) paths.
 To access downloaded files, use the `in/files/` or `/data/in/files/` path. If you want to dig really deep,
 have a look at the [full Common Interface specification](https://developers.keboola.com/extend/common-interface/).
-Temporary files can be written to a `/tmp/` folder. Do not use the `/data/` folder for those files you do not wish to exchange with Keboola Connection.
+Temporary files can be written to a `/tmp/` folder. Do not use the `/data/` folder for those files you do not wish to exchange with Keboola.
 
 ## Python Script Requirements
 Python is **sensitive to indentation**. Make sure not to mix tabs and spaces. All files are assumed to be in UTF;
@@ -90,7 +90,7 @@ you can develop the transformation script locally.
 The script itself is expected to be in the `data` directory. The script name is arbitrary. The `data` directory name
 is also arbitrary, we use it as general reference to the above folder structure. It is possible to use relative 
 directories --- the current directory of the transformation is always the `data` directory. That means you can move 
-the script to a Keboola Connection transformation with no changes. To develop a Python transformation 
+the script to a Keboola transformation with no changes. To develop a Python transformation 
 that takes a [sample CSV file](/transformations/python-plain/source.csv) locally, follow these steps:
 
 - Put the Python code into a file, for example, script.py in the working directory.
@@ -209,7 +209,7 @@ with open('/data/in/tables/source.csv', mode='rt', encoding='utf-8') as in_file,
 {% endhighlight %}
 
 ## Example 3 -- Using CSV Dialect
-You can simplify the above code using our pre-installed Keboola Connection (KBC) dialect.
+You can simplify the above code using our pre-installed Keboola dialect.
 
 {% highlight python %}
 import csv
diff --git a/transformations/python/index.md b/transformations/python/index.md
index 9e340c3f5..03019efd5 100644
--- a/transformations/python/index.md
+++ b/transformations/python/index.md
@@ -41,7 +41,7 @@ The Python script itself will be compiled to `/data/script.py`. To access your i
 relative (`in/tables/file.csv`, `out/tables/file.csv`) or absolute (`/data/in/tables/file.csv`, `/data/out/tables/file.csv`) paths.
 To access downloaded files, use the `in/user/tag` or `/data/in/user/tag` path. If you want to dig really deep,
 have a look at the [full Common Interface specification](https://developers.keboola.com/extend/common-interface/).
-Temporary files can be written to a `/tmp/` folder. Do not use the `/data/` folder for those files you do not wish to exchange with Keboola Connection.
+Temporary files can be written to a `/tmp/` folder. Do not use the `/data/` folder for those files you do not wish to exchange with Keboola.
 
 ## Python Script Requirements
 Python is **sensitive to indentation**. Make sure not to mix tabs and spaces. All files are assumed to be in UTF;
@@ -96,7 +96,7 @@ The following image shows the directory structure:
 ![Screenshot - Data folder structure](/transformations/python/tree.png)
 
 The script itself is expected to be in the `data` directory; its name is arbitrary. It is possible to use relative directories,
-so that you can move the script to a Keboola Connection transformation with no changes. To develop a Python transformation 
+so that you can move the script to a Keboola transformation with no changes. To develop a Python transformation 
 which takes a [sample CSV file](/transformations/source.csv) locally, take the following steps:
 
 - Put the Python code into a file, for example script.py, in the working directory.
@@ -188,7 +188,7 @@ with open('/data/in/tables/source.csv', mode='rt', encoding='utf-8') as in_file,
 {% endhighlight %}
 
 ## Example 3 -- Using CSV dialect
-You can simplify the above code using our pre-installed Keboola Connection (KBC) dialect.
+You can simplify the above code using our pre-installed Keboola dialect.
 
 {% highlight python %}
 import csv
diff --git a/transformations/r-plain/index.md b/transformations/r-plain/index.md
index 1de6d720c..fc86247ef 100644
--- a/transformations/r-plain/index.md
+++ b/transformations/r-plain/index.md
@@ -34,7 +34,7 @@ The R script itself will be compiled to `/data/script.R`. To access your
 relative (`in/tables/file.csv`, `out/tables/file.csv`) or absolute (`/data/in/tables/file.csv`, `/data/out/tables/file.csv`) paths.
 To access downloaded files, use the `in/files/` or `/data/in/files/` path. If you want to dig really deep,
 have a look at the [full Common Interface specification](https://developers.keboola.com/extend/common-interface/).
-Temporary files can be written to a `/tmp/` folder. Do not use the `/data/` folder for those files you do not wish to exchange with Keboola Connection.
+Temporary files can be written to a `/tmp/` folder. Do not use the `/data/` folder for those files you do not wish to exchange with Keboola.
 
 ## R Script Requirements
 You can organize your script into [blocks](/transformations/#writing-scripts), but the resulting R script to be run 
@@ -114,7 +114,7 @@ The following image shows the directory structure:
 ![Screenshot - Data folder structure](/transformations/r/tree.png)
 
 The script itself is expected to be in the `data` directory; its name is arbitrary. It is possible to use relative directories,
-so that you can move the script to a Keboola Connection transformation with no changes. To develop an R transformation which takes
+so that you can move the script to a Keboola transformation with no changes. To develop an R transformation which takes
 a [sample CSV file](/transformations/r/source.csv) locally, take the following steps:
 
 - Put the R code into a file, for instance, script.R in the working directory.
diff --git a/transformations/r/binary.md b/transformations/r/binary.md
index 47f8da39b..13c6d1240 100644
--- a/transformations/r/binary.md
+++ b/transformations/r/binary.md
@@ -46,7 +46,7 @@ Only the second table will be used in the actual R transformation. Upload that t
 ## Step 1 - Create Model
 
 First, it is necessary to get a file with the R model. To create and save a very simple model, use a script similar to the following one. 
-It is supposed to be executed **outside Keboola Connection**, for example, on your local machine.
+It is supposed to be executed **outside Keboola**, for example, on your local machine.
 
 {% highlight r %}
 data <- read.csv("cashier-data.csv")
@@ -58,9 +58,9 @@ After executing the script, you get the `time_model.rda` binary file with a very
 of the **time_spent_in_shop** column on the **number_of_items** column in the data 
 ([cashier-data.csv](/transformations/r/cashier-data.csv)):
  
-## Step 2 - Save Model to Keboola Connection
+## Step 2 - Save Model to Keboola
 
-The second step is to save the model file to Keboola Connection. For that, go to **Storage** -- [**File uploads**](/storage/files/) and upload the obtained file (`time_model.rda`); 
+The second step is to save the model file to Keboola. For that, go to **Storage** -- [**File uploads**](/storage/files/) and upload the obtained file (`time_model.rda`); 
 it should be marked as *permanent* and a tag must be assigned to it.
 
 {: .image-popup}
@@ -109,7 +109,7 @@ The result table will be stored according to the output mapping setting and will
 |  ...             |       |       |       |
 
 This contains the predicted value and lower and upper bound of the confidence interval. The predicted value was 
-obtained from the (very simple linear) model that was created outside Keboola Connection in the first step. This technique with 
+obtained from the (very simple linear) model that was created outside Keboola in the first step. This technique with 
 binary files can also be used for other purposes as they can contain virtually any R code or data.
 
 ## Running & Debugging Locally
diff --git a/transformations/r/index.md b/transformations/r/index.md
index fa68f7f44..4044c8982 100644
--- a/transformations/r/index.md
+++ b/transformations/r/index.md
@@ -42,7 +42,7 @@ The R script itself will be compiled to `/data/script.R`. To access input and ou
 (`in/tables/file.csv`, `out/tables/file.csv`), or absolute (`/data/in/tables/file.csv`, `/data/out/tables/file.csv`) paths.
 To access downloaded files, use the `in/user/tag` or `/data/in/user/tag` path. If you want to dig really deep, have a look
 at the full [Common Interface Specification](https://developers.keboola.com/extend/common-interface/). Temporary files can
-be written to the `/tmp/` folder. Do not use the `/data/` folder for those files you do not wish to exchange with Keboola Connection.
+be written to the `/tmp/` folder. Do not use the `/data/` folder for those files you do not wish to exchange with Keboola.
 
 ## R Script Requirements
 The R script to be run within our environment must meet the following requirements:
@@ -136,7 +136,7 @@ The following image shows the directory structure:
 ![Screenshot - Data folder structure](/transformations/r/tree.png)
 
 The script itself is expected to be in the `data` directory; its name is arbitrary. It is possible to use relative directories,
-so that you can move the script to a Keboola Connection transformation with no changes. To develop an R transformation which takes
+so that you can move the script to a Keboola transformation with no changes. To develop an R transformation which takes
 a [sample CSV file](/transformations/r/source.csv) locally, take the following steps:
 
 - Put the R code into a file, for instance, script.R in the working directory.
diff --git a/transformations/redshift-plain/index.md b/transformations/redshift-plain/index.md
index dd0deb234..df7c53a28 100644
--- a/transformations/redshift-plain/index.md
+++ b/transformations/redshift-plain/index.md
@@ -7,7 +7,7 @@ permalink: /transformations/redshift-plain/
 {:toc}
 
 [AWS Redshift](https://aws.amazon.com/redshift/) is based on PostgreSQL 8.0, where AWS added powerful scaling 
-and made it available in the cloud. Transformations run on your own dedicated cluster in Keboola Connection.
+and made it available in the cloud. Transformations run on your own dedicated cluster in Keboola.
 
 ## Example
 To create a simple Redshift transformation, follow these steps:
@@ -28,7 +28,7 @@ CREATE TABLE "result" AS SELECT * FROM "source";
 You can organize the script into [blocks](/transformations/#writing-scripts).
 
 ## Limits
-Redshift in Keboola Connection does not support functions or stored procedures.
+Redshift in Keboola does not support functions or stored procedures.
 
 There are basic constraints set to keep your Redshift cluster healthy. By upgrading your Redshift cluster 
 to a larger size, these limits can be increased.
diff --git a/transformations/redshift/index.md b/transformations/redshift/index.md
index 91c289785..024326503 100644
--- a/transformations/redshift/index.md
+++ b/transformations/redshift/index.md
@@ -7,7 +7,7 @@ redirect_from:
 ---
 
 AWS Redshift is based on PostgreSQL 8.0 where AWS added powerful scaling and made it available in cloud. Transformations run on
-your own dedicated cluster in Keboola Connection.
+your own dedicated cluster in Keboola.
 
  - If your source data is on Redshift, there is no data transfer.
  - Redshift is a columnar database -- no more indexing, nest JOINs without worries.
@@ -17,7 +17,7 @@ your own dedicated cluster in Keboola Connection.
  [column compression](https://docs.aws.amazon.com/redshift/latest/dg/c_best-practices-use-auto-compression.html).
 
 ### Limits
-Redshift in Keboola Connection does not support functions or stored procedures.
+Redshift in Keboola does not support functions or stored procedures.
 
 There are basic constrains set to keep your Redshift cluster healthy. By upgrading your Redshift cluster to a
 larger size, these limits can be increased.
diff --git a/transformations/sandbox/index.md b/transformations/sandbox/index.md
index 6622a3036..2ddeef988 100644
--- a/transformations/sandbox/index.md
+++ b/transformations/sandbox/index.md
@@ -9,7 +9,7 @@ redirect_from:
 * TOC
 {:toc}
 
-*To create your first Sandbox and see how it is an integral part of the Keboola Connection workflow, go to our [Getting Started tutorial](/tutorial/manipulate/sandbox/).*
+*To create your first Sandbox and see how it is an integral part of the Keboola workflow, go to our [Getting Started tutorial](/tutorial/manipulate/sandbox/).*
 
 A sandbox is a **safe environment** for you to
 
@@ -17,7 +17,7 @@ A sandbox is a **safe environment** for you to
 - test, troubleshoot and develop transformations without modifying any Storage data.
 
 You can fill a sandbox with any data from Storage. However, to simplify transformation development,
-Keboola Connection provides a specific loader for your transformations.
+Keboola provides a specific loader for your transformations.
 It automatically fills the sandbox with relevant tables and takes
 the [Input Mapping](/transformations/mappings/#input-mapping) of the transformation into account.
 
@@ -206,7 +206,7 @@ print(mem_used())
 
 ### Jupyter-Based Sandboxes
 
-Keboola Connection provides Jupyter Notebook sandboxes for Python and Julia. Both features are in beta.
+Keboola provides Jupyter Notebook sandboxes for Python and Julia. Both features are in beta.
 
 #### Python Sandbox
 
diff --git a/transformations/snowflake-plain/index.md b/transformations/snowflake-plain/index.md
index 320c91eac..64c6445d1 100644
--- a/transformations/snowflake-plain/index.md
+++ b/transformations/snowflake-plain/index.md
@@ -118,7 +118,7 @@ Be especially careful when setting up [input and output mappings](/transformatio
 
 When writing your transformation script, quoting all table and column names is highly recommended. 
 Snowflake converts all unquoted table/column identifiers to uppercase, which won't match table/column 
-identifiers created by Keboola Connection (unless they happen to be all uppercase).
+identifiers created by Keboola (unless they happen to be all uppercase).
 
 {% highlight sql %}
 SELECT "barcolumn" FROM "footable";
@@ -222,7 +222,7 @@ CREATE TABLE "out" AS
 Do not use `ALTER SESSION` queries to modify the default timestamp format, as the loading and unloading sessions are separate 
 from your transformation/sandbox session and the format may change unexpectedly.
 
-**Important:** In the AWS US Keboola Connection [region](https://developers.keboola.com/overview/api/#regions-and-endpoints) 
+**Important:** In the AWS US Keboola [region](https://developers.keboola.com/overview/api/#regions-and-endpoints) 
 (connection.keboola.com), the following [Snowflake default](https://docs.snowflake.net/manuals/sql-reference/parameters.html#) 
 parameters are overridden:
 
diff --git a/transformations/snowflake/index.md b/transformations/snowflake/index.md
index fd0d85313..f7d751ea0 100644
--- a/transformations/snowflake/index.md
+++ b/transformations/snowflake/index.md
@@ -58,7 +58,7 @@ as it physically does not move any data.
 #### `_timestamp` system column
 
 A table loaded using *Clone Table* will contain all columns of the original table plus a new `_timestamp` column.
-This column is used internally by Keboola Connection for comparison with the value of the *Changed in last* filter. 
+This column is used internally by Keboola for comparison with the value of the *Changed in last* filter. 
 
 The value in the column contains a unix timestamp of the last change of the row, which is
 
@@ -128,7 +128,7 @@ SELECT * FROM "footable";
 Be especially careful when setting up [input and output mappings](/transformations/mappings/).
 
 When writing your transformation script, quoting all table and column names is required. Snowflake converts all
-unquoted table/column identifiers to uppercase, which won't match table/column identifiers created by Keboola Connection.
+unquoted table/column identifiers to uppercase, which won't match table/column identifiers created by Keboola.
 
 {% highlight sql %}
 SELECT "barcolumn" FROM "footable";
@@ -232,7 +232,7 @@ CREATE TABLE "out" AS
 Do not use `ALTER SESSION` queries to modify the default timestamp format, as the loading and unloading sessions are separate 
 from your transformation/sandbox session and the format may change unexpectedly.
 
-**Important:** In the default US Keboola Connection [region](https://developers.keboola.com/overview/api/#regions-and-endpoints) 
+**Important:** In the default US Keboola [region](https://developers.keboola.com/overview/api/#regions-and-endpoints) 
 (connection.keboola.com), the following [Snowflake default](https://docs.snowflake.net/manuals/sql-reference/parameters.html#) 
 parameters are overridden:
 
diff --git a/transformations/teradata/index.md b/transformations/teradata/index.md
index d419c8d62..d1c9a373f 100644
--- a/transformations/teradata/index.md
+++ b/transformations/teradata/index.md
@@ -35,7 +35,7 @@ You can organize the script into [blocks](/transformations/#writing-scripts).
 ## Bucket Objects for Read-Only Input Mapping
 For more information on how a **read-only input mapping** works, visit the [link](/transformations/mappings/#read-only-input-mapping).
 
-Teradata organizes tables in databases. Each bucket in Keboola Connection is represented by a separate database, usually following this naming pattern: `<stackPrefix>_<projectID>-<bucketID>`
+Teradata organizes tables in databases. Each bucket in Keboola is represented by a separate database, usually following this naming pattern: `<stackPrefix>_<projectID>-<bucketID>`
 - `stackPrefix` – depends on which Keboola stack you are using
   - `SAPI` on https://connection.keboola.com/
   - `KEBOOLA` everywhere else
diff --git a/transformations/workspace/index.md b/transformations/workspace/index.md
index 6ecac9c29..ccf33d754 100644
--- a/transformations/workspace/index.md
+++ b/transformations/workspace/index.md
@@ -109,7 +109,7 @@ you'll see the following error:
     Server Connection Error
     A connection to the Jupyter server could not be established. JupyterLab will continue trying to reconnect. Check your network connection or Jupyter server configuration.
 
-If you see this error, please go to the list of workspaces in Keboola Connection, resume the workspace
+If you see this error, please go to the list of workspaces in Keboola, resume the workspace
 and reconnect from there.
 
 ### Loading Data
diff --git a/tutorial/ad-hoc/index.md b/tutorial/ad-hoc/index.md
index 8983b426b..4301dd3ee 100644
--- a/tutorial/ad-hoc/index.md
+++ b/tutorial/ad-hoc/index.md
@@ -80,7 +80,7 @@ Enter the bucket's name and choose where to store your data (the location type *
 Do not set a retention policy on the bucket. The bucket contains only temporary data and no retention is needed.
 
 ### Extract Data
-Now you're ready to load the data into Keboola Connection. Go to the section **Components -- Extractors**, 
+Now you're ready to load the data into Keboola. Go to the section **Components -- Extractors**, 
 and click **Add New Extractor**:
 
 {: .image-popup}
@@ -144,7 +144,7 @@ Then **Save** the query configuration.
 {: .image-popup}
 ![Screenshot - Query Configuration](/tutorial/ad-hoc/ex-bigquery-10.png)
 
-Now run the configuration to bring the data to Keboola Connection:
+Now run the configuration to bring the data to Keboola:
 
 {: .image-popup}
 ![Screenshot - Finished Configuration](/tutorial/ad-hoc/ex-bigquery-11.png)
@@ -153,7 +153,7 @@ Running the extractor creates a background job that
 
 - executes the queries in Google BigQuery.
 - saves the results to Google Cloud Storage.
-- exports the results from Google Cloud Storage and stores them in specified tables in Keboola Connection Storage.
+- exports the results from Google Cloud Storage and stores them in specified tables in Keboola Storage.
 - removes the results from Google Cloud Storage.
 
 When a job is running, a small orange circle appears under *Last runs*, along with RunId and other info on the job.
@@ -230,7 +230,7 @@ for downloading the data. This could be processed using the
 [Generic Extractor](/components/extractors/other/generic/). However, the data is provided in
 [JSON-stat](https://json-stat.org/) format, which contains tables encoded using the
 [row-major](https://en.wikipedia.org/wiki/Row-_and_column-major_order) method. Even though it is possible
-to import them to Keboola Connection, it would be necessary to do additional processing to obtain plain tables.
+to import them to Keboola, it would be necessary to do additional processing to obtain plain tables.
 
 To save time, use a tool designed for that -- [pyjstat](https://pypi.org/project/pyjstat/). It is a Python library which can read
 JSON-stat data directly into a [Pandas data frame](https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.html).
@@ -277,9 +277,9 @@ For more information about sandboxes (including disk and memory limits), see the
 [corresponding documentation](/transformations/sandbox/).
 
 ## Final Note
-This is the end of our stroll around Keboola Connection. On our walk, we missed quite a few things:
+This is the end of our stroll around Keboola. On our walk, we missed quite a few things:
 Applications, Python, R and Julia transformations, Redshift and Snowflake features, to name a few.
 However, teaching you everything was not really the point of this tutorial.
-We wanted to show you how Keboola Connection can help in connecting different systems together.
+We wanted to show you how Keboola can help in connecting different systems together.
 
 [Return to the beginning](/tutorial/) or [contact us](/).
diff --git a/tutorial/branches/tables-in-branch.md b/tutorial/branches/tables-in-branch.md
index 18de0fe8e..4258bd56d 100644
--- a/tutorial/branches/tables-in-branch.md
+++ b/tutorial/branches/tables-in-branch.md
@@ -73,7 +73,7 @@ Navigate to the transformation and run it. Examine the **Mapping** section in th
 {: .image-popup}
 ![Mapping in branch](/tutorial/branches/figures/mapping-in-branch-2.png)
 
-Notice how the **Input** section shows the data loaded from the `bitcoin_price` table, even though you did not run the extractor in this branch. When a branch version of a table does not exist, Keboola Connection uses the production version as a fall back. 
+Notice how the **Input** section shows the data loaded from the `bitcoin_price` table, even though you did not run the extractor in this branch. When a branch version of a table does not exist, Keboola uses the production version as a fall back. 
 
 Also notice that **Output** shows the small yellow branch icon, and the name of the bucket is prefixed with a number -- 
 `1835-bitcoin`. When you run a component in a branch and the component wants to write to Storage, the outputs do not 
@@ -129,7 +129,7 @@ and verify that the `bitcoin_prices` table from the branch was used as input.
 {: .image-popup}
 ![Input mapping from branch data](/tutorial/branches/figures/input-mapping-from-branch.png)
 
-What happened is that Keboola Connection checked whether a branch version of the bucket existed and since it did 
+What happened is that Keboola checked whether a branch version of the bucket existed and since it did 
 (you ran the branch version of the HTTP extractor), it was used in the transformation.
 
 ## Extend Transformation