diff --git a/.rat-excludes b/.rat-excludes
index 482a8e0fe..a00917ba7 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -1,5 +1,6 @@
 # Note: these patterns are applied to single files or directories, not full paths
 .gitignore
+docs/README.md
 .gitattributes
 .gitkeep
 .coverage
diff --git a/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts
index a25a28d38..dd52849ea 100644
--- a/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts
@@ -24,7 +24,7 @@ import { FORM_DATA_DEFAULTS, NUM_METRIC } from './visualizations/shared.helper';
 describe('Datasource control', () => {
   const newMetricName = `abc${Date.now()}`;
 
-  it('should allow edit datasource', () => {
+  it('should allow edit dataset', () => {
     let numScripts = 0;
 
     cy.login();
@@ -40,7 +40,7 @@ describe('Datasource control', () => {
       numScripts = nodes.length;
     });
 
-    cy.get('a').contains('Edit Datasource').click();
+    cy.get('a').contains('Edit Dataset').click();
 
     // should load additional scripts for the modal
     cy.get('script').then(nodes => {
@@ -64,7 +64,7 @@ describe('Datasource control', () => {
       .type(newMetricName, { force: true });
     // delete metric
     cy.get('#datasource_menu').click();
-    cy.get('a').contains('Edit Datasource').click();
+    cy.get('a').contains('Edit Dataset').click();
     cy.get('a[role="tab"]').contains('Metrics').click();
     cy.get(`input[value="${newMetricName}"]`)
       .closest('tr')
diff --git a/superset-frontend/src/addSlice/AddSliceContainer.tsx b/superset-frontend/src/addSlice/AddSliceContainer.tsx
index 88bc3cc91..edb8e93df 100644
--- a/superset-frontend/src/addSlice/AddSliceContainer.tsx
+++ b/superset-frontend/src/addSlice/AddSliceContainer.tsx
@@ -95,7 +95,7 @@ export default class AddSliceContainer extends React.PureComponent<
           </Panel.Heading>
           <Panel.Body>
             <div>
-              <p>{t('Choose a datasource')}</p>
+              <p>{t('Choose a dataset')}</p>
               <div style={styleSelectContainer}>
                 <Select
                   clearable={false}
@@ -116,7 +116,7 @@ export default class AddSliceContainer extends React.PureComponent<
               </div>
               <span className="text-muted">
                 {t(
-                  'If the datasource you are looking for is not available in the list, follow the instructions on how to add it in the Superset tutorial.',
+                  'If the dataset you are looking for is not available in the list, follow the instructions on how to add it in the Superset tutorial.',
                 )}{' '}
                 <a
                   href="https://superset.apache.org/docs/creating-charts-dashboards/first-dashboard#adding-a-new-table"
diff --git a/superset-frontend/src/components/Button/index.tsx b/superset-frontend/src/components/Button/index.tsx
index 5b56c8b53..1541b745d 100644
--- a/superset-frontend/src/components/Button/index.tsx
+++ b/superset-frontend/src/components/Button/index.tsx
@@ -237,6 +237,7 @@ export default function Button(props: ButtonProps) {
   const buttonProps = {
     ...props,
     bsSize: props.buttonSize,
+    disabled: props.disabled || false,
     placement: props.placement || 'top',
   };
   const { tooltip, placement, dropdownItems } = props;
diff --git a/superset-frontend/src/dashboard/components/SliceAdder.jsx b/superset-frontend/src/dashboard/components/SliceAdder.jsx
index 80d80cbf4..fbb8ac7b0 100644
--- a/superset-frontend/src/dashboard/components/SliceAdder.jsx
+++ b/superset-frontend/src/dashboard/components/SliceAdder.jsx
@@ -55,7 +55,7 @@ const KEYS_TO_FILTERS = ['slice_name', 'viz_type', 'datasource_name'];
 const KEYS_TO_SORT = [
   { key: 'slice_name', label: 'Name' },
   { key: 'viz_type', label: 'Vis type' },
-  { key: 'datasource_name', label: 'Datasource' },
+  { key: 'datasource_name', label: 'Dataset' },
   { key: 'changed_on', label: 'Recent' },
 ];
 
diff --git a/superset-frontend/src/datasource/ChangeDatasourceModal.tsx b/superset-frontend/src/datasource/ChangeDatasourceModal.tsx
index b5895c122..3149db6ec 100644
--- a/superset-frontend/src/datasource/ChangeDatasourceModal.tsx
+++ b/superset-frontend/src/datasource/ChangeDatasourceModal.tsx
@@ -37,8 +37,8 @@ interface ChangeDatasourceModalProps {
 const TABLE_COLUMNS = ['name', 'type', 'schema', 'connection', 'creator'];
 const TABLE_FILTERABLE = ['rawName', 'type', 'schema', 'connection', 'creator'];
 const CHANGE_WARNING_MSG = t(
-  'Changing the datasource may break the chart if the chart relies ' +
-    'on columns or metadata that does not exist in the target datasource',
+  'Changing the dataset may break the chart if the chart relies ' +
+    'on columns or metadata that does not exist in the target dataset',
 );
 
 const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
@@ -123,7 +123,7 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
   return (
     <Modal show={show} onHide={onHide} onEnter={onEnterModal} bsSize="large">
       <Modal.Header closeButton>
-        <Modal.Title>{t('Select a datasource')}</Modal.Title>
+        <Modal.Title>{t('Select a dataset')}</Modal.Title>
       </Modal.Header>
       <Modal.Body>
         <Alert bsStyle="warning">
diff --git a/superset-frontend/src/datasource/DatasourceEditor.jsx b/superset-frontend/src/datasource/DatasourceEditor.jsx
index dd7cd72c5..72037fdf0 100644
--- a/superset-frontend/src/datasource/DatasourceEditor.jsx
+++ b/superset-frontend/src/datasource/DatasourceEditor.jsx
@@ -524,7 +524,7 @@ class DatasourceEditor extends React.PureComponent {
         <Field
           fieldKey="owners"
           label={t('Owners')}
-          description={t('Owners of the datasource')}
+          description={t('Owners of the dataset')}
           control={
             <SelectAsyncControl
               dataEndpoint="/users/api/read"
diff --git a/superset-frontend/src/datasource/DatasourceModal.tsx b/superset-frontend/src/datasource/DatasourceModal.tsx
index 1507ee7c4..0f9f0754b 100644
--- a/superset-frontend/src/datasource/DatasourceModal.tsx
+++ b/superset-frontend/src/datasource/DatasourceModal.tsx
@@ -100,7 +100,7 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
       },
     })
       .then(({ json }) => {
-        addSuccessToast(t('The datasource has been saved'));
+        addSuccessToast(t('The dataset has been saved'));
         onDatasourceSave(json);
         onHide();
       })
diff --git a/superset-frontend/src/explore/components/PropertiesModal.tsx b/superset-frontend/src/explore/components/PropertiesModal.tsx
index c1e7777f8..7c374eeed 100644
--- a/superset-frontend/src/explore/components/PropertiesModal.tsx
+++ b/superset-frontend/src/explore/components/PropertiesModal.tsx
@@ -221,7 +221,7 @@ function PropertiesModal({ slice, onHide, onSave }: InternalProps) {
               />
               <p className="help-block">
                 {t(
-                  'Duration (in seconds) of the caching timeout for this chart. Note this defaults to the datasource/table timeout if undefined.',
+                  "Duration (in seconds) of the caching timeout for this chart. Note this defaults to the dataset's timeout if undefined.",
                 )}
               </p>
             </FormGroup>
diff --git a/superset-frontend/src/explore/components/controls/DatasourceControl.jsx b/superset-frontend/src/explore/components/controls/DatasourceControl.jsx
index d805c9342..16410ab1a 100644
--- a/superset-frontend/src/explore/components/controls/DatasourceControl.jsx
+++ b/superset-frontend/src/explore/components/controls/DatasourceControl.jsx
@@ -183,8 +183,8 @@ class DatasourceControl extends React.PureComponent {
           <OverlayTrigger
             placement="top"
             overlay={
-              <Tooltip id="toggle-datasource-tooltip">
-                {t('Expand/collapse datasource configuration')}
+              <Tooltip id="toggle-dataset-tooltip">
+                {t('Expand/collapse dataset configuration')}
               </Tooltip>
             }
           >
@@ -202,7 +202,7 @@ class DatasourceControl extends React.PureComponent {
           </OverlayTrigger>
           <TooltipWrapper
             label="change-datasource"
-            tooltip={t('more dataset related options')}
+            tooltip={t('More dataset related options')}
             trigger={['hover']}
           >
             <DropdownButton
@@ -212,7 +212,7 @@ class DatasourceControl extends React.PureComponent {
               id="datasource_menu"
             >
               <MenuItem eventKey="3" onClick={this.toggleChangeDatasourceModal}>
-                {t('Change Datasource')}
+                {t('Change Dataset')}
               </MenuItem>
               {datasource.type === 'table' && (
                 <MenuItem
@@ -226,7 +226,7 @@ class DatasourceControl extends React.PureComponent {
               )}
               {this.props.isEditable && (
                 <MenuItem eventKey="3" onClick={this.toggleEditDatasourceModal}>
-                  {t('Edit Datasource')}
+                  {t('Edit Dataset')}
                 </MenuItem>
               )}
             </DropdownButton>
diff --git a/superset-frontend/src/explore/controlPanels/sections.jsx b/superset-frontend/src/explore/controlPanels/sections.jsx
index 5e225bcaa..d5e619c2a 100644
--- a/superset-frontend/src/explore/controlPanels/sections.jsx
+++ b/superset-frontend/src/explore/controlPanels/sections.jsx
@@ -28,7 +28,7 @@ export const druidTimeSeries = {
 };
 
 export const datasourceAndVizType = {
-  label: t('Datasource & Chart Type'),
+  label: t('Dataset & Chart Type'),
   expanded: true,
   controlSetRows: [
     ['datasource'],
diff --git a/superset-frontend/src/profile/components/Security.tsx b/superset-frontend/src/profile/components/Security.tsx
index 6912886c3..35daa8132 100644
--- a/superset-frontend/src/profile/components/Security.tsx
+++ b/superset-frontend/src/profile/components/Security.tsx
@@ -57,7 +57,7 @@ export default function Security({ user }: SecurityProps) {
         {user.permissions.datasource_access && (
           <div>
             <h4>
-              {t('Datasources')}{' '}
+              {t('Datasets')}{' '}
               <Badge>{user.permissions.datasource_access.length}</Badge>
             </h4>
             {user.permissions.datasource_access.map(role => (
diff --git a/superset-frontend/src/utils/getClientErrorObject.ts b/superset-frontend/src/utils/getClientErrorObject.ts
index a2aab27b8..bd58d0136 100644
--- a/superset-frontend/src/utils/getClientErrorObject.ts
+++ b/superset-frontend/src/utils/getClientErrorObject.ts
@@ -103,7 +103,7 @@ export default function getClientErrorObject(
                   {
                     code: 1000,
                     message: t(
-                      'Issue 1000 - The datasource is too large to query.',
+                      'Issue 1000 - The dataset is too large to query.',
                     ),
                   },
                   {
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx
index f0e2c6cdf..c7ff2d3fb 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx
@@ -314,7 +314,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
         >
           <StyledInputContainer>
             <div className="label">
-              {t('Datasource Name')}
+              {t('Database Name')}
               <span className="required">*</span>
             </div>
             <div className="input-container">
@@ -322,7 +322,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
                 type="text"
                 name="database_name"
                 value={db ? db.database_name : ''}
-                placeholder={t('Name your datasource')}
+                placeholder={t('Name your dataset')}
                 onChange={onInputChange}
               />
             </div>
diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
index 0beb9eff2..d85788255 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
@@ -351,10 +351,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
           'dataset',
           'database',
           createErrorHandler(errMsg =>
-            t(
-              'An error occurred while fetching dataset datasource values: %s',
-              errMsg,
-            ),
+            t('An error occurred while fetching datasets: %s', errMsg),
           ),
         ),
         paginate: true,