diff --git a/WORKSPACE b/WORKSPACE
index da4647a..a10b92c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-workspace(name = "aspect_gcc_toolchain")
+workspace(name = "gcc_toolchain")
 
 load("//toolchain:repositories.bzl", "gcc_toolchain_dependencies")
 
diff --git a/docs/defs.md b/docs/defs.md
index 89f9195..36c3d6e 100644
--- a/docs/defs.md
+++ b/docs/defs.md
@@ -26,7 +26,7 @@ gcc_toolchain(<a href="#gcc_toolchain-name">name</a>, <a href="#gcc_toolchain-bi
 | <a id="gcc_toolchain-extra_cxxflags"></a>extra_cxxflags |  Extra flags for compiling C++.   | List of strings | optional | <code>[]</code> |
 | <a id="gcc_toolchain-extra_fflags"></a>extra_fflags |  Extra flags for compiling Fortran.   | List of strings | optional | <code>[]</code> |
 | <a id="gcc_toolchain-extra_ldflags"></a>extra_ldflags |  Extra flags for linking. %sysroot% is rendered to the sysroot path. %workspace% is rendered to the toolchain root path. See https://github.com/bazelbuild/bazel/blob/a48e246e/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderHelper.java#L234-L254.   | List of strings | optional | <code>[]</code> |
-| <a id="gcc_toolchain-gcc_toolchain_workspace_name"></a>gcc_toolchain_workspace_name |  The name given to the gcc-toolchain repository, if the default was not used.   | String | optional | <code>"aspect_gcc_toolchain"</code> |
+| <a id="gcc_toolchain-gcc_toolchain_workspace_name"></a>gcc_toolchain_workspace_name |  The name given to the gcc-toolchain repository, if the default was not used.   | String | optional | <code>"gcc_toolchain"</code> |
 | <a id="gcc_toolchain-includes"></a>includes |  Extra includes for compiling C and C++. %sysroot% is rendered to the sysroot path. %workspace% is rendered to the toolchain root path. See https://github.com/bazelbuild/bazel/blob/a48e246e/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderHelper.java#L234-L254.   | List of strings | optional | <code>[]</code> |
 | <a id="gcc_toolchain-repo_mapping"></a>repo_mapping |  A dictionary from local repository name to global repository name. This allows controls over workspace dependency resolution for dependencies of this repository.&lt;p&gt;For example, an entry <code>"@foo": "@bar"</code> declares that, for any time this repository depends on <code>@foo</code> (such as a dependency on <code>@foo//some:target</code>, it should actually resolve that dependency within globally-declared <code>@bar</code> (<code>@bar//some:target</code>).   | <a href="https://bazel.build/rules/lib/dict">Dictionary: String -> String</a> | required |  |
 | <a id="gcc_toolchain-sysroot"></a>sysroot |  A sysroot to be used as the logical build root.   | String | required |  |
diff --git a/toolchain/defs.bzl b/toolchain/defs.bzl
index 9a15de2..46d1fb0 100644
--- a/toolchain/defs.bzl
+++ b/toolchain/defs.bzl
@@ -110,7 +110,7 @@ _FEATURE_ATTRS = {
     ),
     "gcc_toolchain_workspace_name": attr.string(
         doc = "The name given to the gcc-toolchain repository, if the default was not used.",
-        default = "aspect_gcc_toolchain",
+        default = "gcc_toolchain",
     ),
     "includes": attr.string_list(
         doc = "Extra includes for compiling C and C++." +