diff --git a/docs/en/sql/endpoints/sql-cli.asciidoc b/docs/en/sql/endpoints/cli.asciidoc
similarity index 100%
rename from docs/en/sql/endpoints/sql-cli.asciidoc
rename to docs/en/sql/endpoints/cli.asciidoc
diff --git a/docs/en/sql/endpoints/index.asciidoc b/docs/en/sql/endpoints/index.asciidoc
new file mode 100644
index 00000000000..dc4289aef92
--- /dev/null
+++ b/docs/en/sql/endpoints/index.asciidoc
@@ -0,0 +1,4 @@
+include::rest.asciidoc[]
+include::translate.asciidoc[]
+include::cli.asciidoc[]
+include::jdbc.asciidoc[]
diff --git a/docs/en/sql/endpoints/sql-jdbc.asciidoc b/docs/en/sql/endpoints/jdbc.asciidoc
similarity index 100%
rename from docs/en/sql/endpoints/sql-jdbc.asciidoc
rename to docs/en/sql/endpoints/jdbc.asciidoc
diff --git a/docs/en/sql/endpoints/sql-rest.asciidoc b/docs/en/sql/endpoints/rest.asciidoc
similarity index 100%
rename from docs/en/sql/endpoints/sql-rest.asciidoc
rename to docs/en/sql/endpoints/rest.asciidoc
diff --git a/docs/en/sql/endpoints/sql-endpoints.asciidoc b/docs/en/sql/endpoints/sql-endpoints.asciidoc
deleted file mode 100644
index d9bb59f3896..00000000000
--- a/docs/en/sql/endpoints/sql-endpoints.asciidoc
+++ /dev/null
@@ -1,4 +0,0 @@
-include::sql-rest.asciidoc[]
-include::sql-translate.asciidoc[]
-include::sql-cli.asciidoc[]
-include::sql-jdbc.asciidoc[]
diff --git a/docs/en/sql/endpoints/sql-translate.asciidoc b/docs/en/sql/endpoints/translate.asciidoc
similarity index 100%
rename from docs/en/sql/endpoints/sql-translate.asciidoc
rename to docs/en/sql/endpoints/translate.asciidoc
diff --git a/docs/en/sql/functions/sql-functions.asciidoc b/docs/en/sql/functions/index.asciidoc
similarity index 100%
rename from docs/en/sql/functions/sql-functions.asciidoc
rename to docs/en/sql/functions/index.asciidoc
diff --git a/docs/en/sql/sql-getting-started.asciidoc b/docs/en/sql/getting-started.asciidoc
similarity index 100%
rename from docs/en/sql/sql-getting-started.asciidoc
rename to docs/en/sql/getting-started.asciidoc
diff --git a/docs/en/sql/index.asciidoc b/docs/en/sql/index.asciidoc
index aea97f37e34..6b9492f961a 100644
--- a/docs/en/sql/index.asciidoc
+++ b/docs/en/sql/index.asciidoc
@@ -25,9 +25,9 @@ indices and return tabular results. There are four main components:
     A JDBC driver for Elasticsearch.
 --
 
-include::sql-getting-started.asciidoc[]
-include::endpoints/sql-endpoints.asciidoc[]
-include::functions/sql-functions.asciidoc[]
-include::language/sql-language.asciidoc[]
+include::getting-started.asciidoc[]
+include::endpoints/index.asciidoc[]
+include::functions/index.asciidoc[]
+include::language/index.asciidoc[]
 
 :jdbc-tests!:
diff --git a/docs/en/sql/language/sql-data-types.asciidoc b/docs/en/sql/language/data-types.asciidoc
similarity index 100%
rename from docs/en/sql/language/sql-data-types.asciidoc
rename to docs/en/sql/language/data-types.asciidoc
diff --git a/docs/en/sql/language/sql-language.asciidoc b/docs/en/sql/language/index.asciidoc
similarity index 68%
rename from docs/en/sql/language/sql-language.asciidoc
rename to docs/en/sql/language/index.asciidoc
index 3ad7dc61748..24bf450f1e4 100644
--- a/docs/en/sql/language/sql-language.asciidoc
+++ b/docs/en/sql/language/index.asciidoc
@@ -4,6 +4,6 @@
 This chapter describes the SQL syntax and data types supported in X-Pack.
 As a general rule, the syntax tries to adhere as much as possible to ANSI SQL to make the transition seamless.
 
-include::sql-data-types.asciidoc[]
-include::sql-syntax.asciidoc[]
-include::sql-reserved.asciidoc[]
+include::data-types.asciidoc[]
+include::syntax.asciidoc[]
+include::reserved.asciidoc[]
diff --git a/docs/en/sql/language/sql-reserved.asciidoc b/docs/en/sql/language/reserved.asciidoc
similarity index 100%
rename from docs/en/sql/language/sql-reserved.asciidoc
rename to docs/en/sql/language/reserved.asciidoc
diff --git a/docs/en/sql/language/sql-syntax.asciidoc b/docs/en/sql/language/syntax.asciidoc
similarity index 100%
rename from docs/en/sql/language/sql-syntax.asciidoc
rename to docs/en/sql/language/syntax.asciidoc