22 files changed, 66 insertions, 65 deletions
diff --git a/.gitignore b/.gitignore
index e6919272..5d85a2dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,6 +90,7 @@ gtk-doc.make
 gtk-doc.m4
 
 intel-gpu-tools-*/
+igt-gpu-tools-*/
 
 piglit
 results
diff --git a/CONTRIBUTING b/CONTRIBUTING
index 8a118134..6d293fd8 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -1,4 +1,4 @@
-Patches to intel-gpu-tools are very much welcome, we really want this to be the
+Patches to igt-gpu-tools are very much welcome, we really want this to be the
 universal set of low-level tools and testcases for the Intel kernel gfx driver
 on Linux and similar platforms. So please bring on porting patches, bugfixes,
 improvements for documentation and new tools and testcases.
@@ -28,7 +28,7 @@ A short list of contribution guidelines:
 
   on its first invocation.
 
-- intel-gpu-tools is MIT licensed and we require contributions to follow the
+- igt-gpu-tools is MIT licensed and we require contributions to follow the
   developer's certificate of origin: http://developercertificate.org/
 
 - When submitting new testcases please follow the naming conventions documented
@@ -44,7 +44,7 @@ A short list of contribution guidelines:
 
 - When patches from new contributors (without commit access) are stuck, for
   anything related to the regular releases, issues with packaging and
-  integrating platform support or any other intel-gpu-tools issues, please
+  integrating platform support or any other igt-gpu-tools issues, please
   contact one of the maintainers (listed in the MAINTAINERS file) and cc the
   igt-dev mailing list.
 
diff --git a/README b/README
index 82c1cad5..c71ecedd 100644
--- a/README
+++ b/README
@@ -1,18 +1,18 @@
-Intel GPU Tools
-===============
+IGT GPU Tools
+=============
 
 Description
 -----------
 
-Intel GPU Tools is a collection of tools for development and testing of the
-Intel DRM driver. There are many macro-level test suites that get used against
-the driver, including xtest, rendercheck, piglit, and oglconform, but failures
-from those can be difficult to track down to kernel changes, and many require
+IGT GPU Tools is a collection of tools for development and testing of the DRM
+drivers. There are many macro-level test suites that get used against the
+drivers, including xtest, rendercheck, piglit, and oglconform, but failures from
+those can be difficult to track down to kernel changes, and many require
 complicated build procedures or specific testing environments to get useful
-results. Therefore, Intel GPU Tools includes low-level tools and tests
-specifically for development and testing of the Intel DRM Driver.
+results. Therefore, IGT GPU Tools includes low-level tools and tests
+specifically for development and testing of the DRM Drivers.
 
-Intel GPU Tools is split into several sections:
+IGT GPU Tools is split into several sections:
 
 benchmarks/
 	This is a collection of useful microbenchmarks that can be used to tune
@@ -63,7 +63,7 @@ tests/
 
 	Set the IGT_TEST_ROOT environment variable to point to the tests
 	directory, or set the path key in the "igt" section of piglit.conf to
-	the intel-gpu-tools root directory.
+	the igt-gpu-tools root directory.
 
 	The tests in the i-g-t sources need to have been built already. Then we
 	can run the testcases with (as usual as root, no other drm clients
@@ -112,7 +112,7 @@ debugger/
 	The debugger must be run as root: "sudo debugger/eudb"
 
 docs/
-	Contains the automatically generated intel-gpu-tools libraries
+	Contains the automatically generated igt-gpu-tools libraries
 	reference documentation in docs/reference/. You need to have the
 	gtk-doc tools installed and use the "--enable-gtk-doc" configure flag
 	to generate this API documentation.
@@ -123,8 +123,8 @@ docs/
 
 	If you've added/changed/removed a symbol or anything else that changes
 	the overall structure or indexes, this needs to be reflected in
-	intel-gpu-tools-sections.txt. Entirely new sections will also need to be
-	added to intel-gpu-tools-docs.xml in the appropriate place.
+	igt-gpu-tools-sections.txt. Entirely new sections will also need to be
+	added to igt-gpu-tools-docs.xml in the appropriate place.
 
 include/drm-uapi
 	Imported DRM uapi headers from airlied's drm-next branch.
@@ -186,7 +186,7 @@ should continue to be used for that.
 
 Documentation is built using
 
-$ cd build && ninja && ninja intel-gpu-tools-doc
+$ cd build && ninja && ninja igt-gpu-tools-doc
 
 Note that there's a setup script similar to ./autogen.sh which creates a
 compatibility Makefile with a few useful default targets:
diff --git a/benchmarks/Makefile.sources b/benchmarks/Makefile.sources
index d150035a..86928df5 100644
--- a/benchmarks/Makefile.sources
+++ b/benchmarks/Makefile.sources
@@ -1,4 +1,4 @@
-benchmarksdir=$(libexecdir)/intel-gpu-tools/benchmarks
+benchmarksdir=$(libexecdir)/igt-gpu-tools/benchmarks
 
 benchmarks_prog_list =			\
 	gem_blt				\
diff --git a/configure.ac b/configure.ac
index c5ee78bb..2f6bc70e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,10 +21,10 @@
 # Process this file with autoconf to produce a configure script
 
 AC_PREREQ([2.60])
-AC_INIT([intel-gpu-tools],
+AC_INIT([igt-gpu-tools],
 	[1.22],
 	[https://bugs.freedesktop.org/enter_bug.cgi?product=DRI&component=IGT],
-	[intel-gpu-tools])
+	[igt-gpu-tools])
 
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
@@ -390,8 +390,8 @@ AC_CONFIG_FILES([
 		 benchmarks/wsim/Makefile
 		 docs/Makefile
 		 docs/reference/Makefile
-		 docs/reference/intel-gpu-tools/Makefile
-		 docs/reference/intel-gpu-tools/version.xml
+		 docs/reference/igt-gpu-tools/Makefile
+		 docs/reference/igt-gpu-tools/version.xml
 		 lib/Makefile
 		 lib/tests/Makefile
 		 man/Makefile
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 4f579b58..13a1954e 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1 +1 @@
-SUBDIRS = intel-gpu-tools
+SUBDIRS = igt-gpu-tools
diff --git a/docs/reference/igt-gpu-tools/.gitignore b/docs/reference/igt-gpu-tools/.gitignore
new file mode 100644
index 00000000..9a788a26
--- /dev/null
+++ b/docs/reference/igt-gpu-tools/.gitignore
@@ -0,0 +1,27 @@
+/gtkdoc-check.log
+/gtkdoc-check.trs
+/html-build.stamp
+/html.stamp
+/html/
+/igt_test_programs_*.xml
+/igt-gpu-tools-decl-list.txt
+/igt-gpu-tools-decl.txt
+/igt-gpu-tools-overrides.txt
+/igt-gpu-tools-sections.txt
+/igt-gpu-tools-undeclared.txt
+/igt-gpu-tools-undocumented.txt
+/igt-gpu-tools-unused.txt
+/igt-gpu-tools.args
+/igt-gpu-tools.hierarchy
+/igt-gpu-tools.igt
+/igt-gpu-tools.prerequisites
+/igt-gpu-tools.signals
+/igt-gpu-tools.types
+/scan-build.stamp
+/setup-build.stamp
+/sgml-build.stamp
+/sgml.stamp
+/test-suite.log
+/version.xml
+/xml/
+
diff --git a/docs/reference/intel-gpu-tools/Makefile.am b/docs/reference/igt-gpu-tools/Makefile.am
index ee1e900f..11ada326 100644
--- a/docs/reference/intel-gpu-tools/Makefile.am
+++ b/docs/reference/igt-gpu-tools/Makefile.am
@@ -75,7 +75,7 @@ AUTOMAKE_OPTIONS = 1.6
 # of using the various options.
 
 # The name of the module, e.g. 'glib'.
-DOC_MODULE=intel-gpu-tools
+DOC_MODULE=igt-gpu-tools
 
 # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
 #DOC_MODULE_VERSION=2
diff --git a/docs/reference/intel-gpu-tools/generate_description_xml.sh b/docs/reference/igt-gpu-tools/generate_description_xml.sh
index 705a7bf3..705a7bf3 100644
--- a/docs/reference/intel-gpu-tools/generate_description_xml.sh
+++ b/docs/reference/igt-gpu-tools/generate_description_xml.sh
diff --git a/docs/reference/intel-gpu-tools/generate_programs_xml.sh b/docs/reference/igt-gpu-tools/generate_programs_xml.sh
index 73adc8cc..73adc8cc 100755
--- a/docs/reference/intel-gpu-tools/generate_programs_xml.sh
+++ b/docs/reference/igt-gpu-tools/generate_programs_xml.sh
diff --git a/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml b/docs/reference/igt-gpu-tools/igt-gpu-tools-docs.xml
index 7d9efd77..ac83272f 100644
--- a/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml
+++ b/docs/reference/igt-gpu-tools/igt-gpu-tools-docs.xml
@@ -7,9 +7,9 @@
 ]>
 <book id="index">
   <bookinfo>
-    <title>intel-gpu-tools Reference Manual</title>
+    <title>igt-gpu-tools Reference Manual</title>
     <releaseinfo>
-      for intel-gpu-tools &version;.
+      for igt-gpu-tools &version;.
     </releaseinfo>
   </bookinfo>
 
diff --git a/docs/reference/intel-gpu-tools/igt_test_programs.xml b/docs/reference/igt-gpu-tools/igt_test_programs.xml
index ec05d53e..ec05d53e 100644
--- a/docs/reference/intel-gpu-tools/igt_test_programs.xml
+++ b/docs/reference/igt-gpu-tools/igt_test_programs.xml
diff --git a/docs/reference/intel-gpu-tools/meson.build b/docs/reference/igt-gpu-tools/meson.build
index 1c009229..aadb9af5 100644
--- a/docs/reference/intel-gpu-tools/meson.build
+++ b/docs/reference/igt-gpu-tools/meson.build
@@ -69,11 +69,11 @@ configure_file(input: 'version.xml.in',
 	       output: 'version.xml',
 	       install: false, configuration: config)
 
-gnome.gtkdoc('intel-gpu-tools',
+gnome.gtkdoc('igt-gpu-tools',
 	     content_files : ['igt_test_programs.xml'],
 	     dependencies : lib_igt,
 	     install : true,
-	     main_xml : 'intel-gpu-tools-docs.xml',
+	     main_xml : 'igt-gpu-tools-docs.xml',
 	     scan_args : '--rebuild-sections',
 	     mkdb_args : '--output-format=xml',
 	     ignore_headers : ignore_headers,
diff --git a/docs/reference/intel-gpu-tools/version.xml.in b/docs/reference/igt-gpu-tools/version.xml.in
index a24f9877..a24f9877 100644
--- a/docs/reference/intel-gpu-tools/version.xml.in
+++ b/docs/reference/igt-gpu-tools/version.xml.in
diff --git a/docs/reference/intel-gpu-tools/.gitignore b/docs/reference/intel-gpu-tools/.gitignore
deleted file mode 100644
index 00c1b023..00000000
--- a/docs/reference/intel-gpu-tools/.gitignore
+++ /dev/null
@@ -1,27 +0,0 @@
-/gtkdoc-check.log
-/gtkdoc-check.trs
-/html-build.stamp
-/html.stamp
-/html/
-/igt_test_programs_*.xml
-/intel-gpu-tools-decl-list.txt
-/intel-gpu-tools-decl.txt
-/intel-gpu-tools-overrides.txt
-/intel-gpu-tools-sections.txt
-/intel-gpu-tools-undeclared.txt
-/intel-gpu-tools-undocumented.txt
-/intel-gpu-tools-unused.txt
-/intel-gpu-tools.args
-/intel-gpu-tools.hierarchy
-/intel-gpu-tools.interfaces
-/intel-gpu-tools.prerequisites
-/intel-gpu-tools.signals
-/intel-gpu-tools.types
-/scan-build.stamp
-/setup-build.stamp
-/sgml-build.stamp
-/sgml.stamp
-/test-suite.log
-/version.xml
-/xml/
-
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 944f28a5..85a8aa47 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -1 +1 @@
-subdir('intel-gpu-tools')
+subdir('igt-gpu-tools')
diff --git a/lib/drmtest.c b/lib/drmtest.c
index fd11f5f5..fae6f86f 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -71,8 +71,8 @@
  *
  * But there's also a bit of other assorted stuff here.
  *
- * Note that this library's header pulls in the [i-g-t core](intel-gpu-tools-i-g-t-core.html)
- * and [batchbuffer](intel-gpu-tools-intel-batchbuffer.html) libraries as dependencies.
+ * Note that this library's header pulls in the [i-g-t core](igt-gpu-tools-i-g-t-core.html)
+ * and [batchbuffer](igt-gpu-tools-intel-batchbuffer.html) libraries as dependencies.
  */
 
 uint16_t __drm_device_id;
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 35c77da7..0cee0c06 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -74,7 +74,7 @@
  * functions have all igt_ prefixes. This part is still very much work in
  * progress and so also lacks a bit documentation for the individual functions.
  *
- * Note that this library's header pulls in the [i-g-t framebuffer](intel-gpu-tools-i-g-t-framebuffer.html)
+ * Note that this library's header pulls in the [i-g-t framebuffer](igt-gpu-tools-i-g-t-framebuffer.html)
  * library as a dependency.
  */
 
diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
index be73577b..a85c760c 100644
--- a/lib/intel_batchbuffer.c
+++ b/lib/intel_batchbuffer.c
@@ -61,7 +61,7 @@
  * structure called batch is in scope. The basic macros are #BEGIN_BATCH,
  * #OUT_BATCH, #OUT_RELOC and #ADVANCE_BATCH.
  *
- * Note that this library's header pulls in the [i-g-t core](intel-gpu-tools-i-g-t-core.html)
+ * Note that this library's header pulls in the [i-g-t core](igt-gpu-tools-i-g-t-core.html)
  * library as a dependency.
  */
 
diff --git a/lib/intel_mmio.c b/lib/intel_mmio.c
index 07b9ed14..a5458aeb 100644
--- a/lib/intel_mmio.c
+++ b/lib/intel_mmio.c
@@ -51,7 +51,7 @@
  * @short_description: Register access and sideband I/O library
  * @title: I/O
  * @include: igt.h
- * @section_id: intel-gpu-tools-IO
+ * @section_id: igt-gpu-tools-IO
  *
  * This library provides register I/O helpers in both a basic version and a more
  * fancy version which also handles forcewake and can optionally check registers
diff --git a/meson.build b/meson.build
index 5b783e5d..cd736d8e 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('intel-gpu-tools', 'c',
+project('igt-gpu-tools', 'c',
 	version : '1.22',
         default_options: [
           'warning_level=2',
@@ -125,10 +125,10 @@ configure_file(output: 'config.h', install: false, configuration: config)
 
 prefix = get_option('prefix')
 bindir = get_option('bindir')
-datadir = join_paths(get_option('datadir'), 'intel-gpu-tools')
+datadir = join_paths(get_option('datadir'), 'igt-gpu-tools')
 includedir = get_option('includedir')
 libdir = get_option('libdir')
-libexecdir = join_paths(get_option('libexecdir'), 'intel-gpu-tools')
+libexecdir = join_paths(get_option('libexecdir'), 'igt-gpu-tools')
 mandir = get_option('mandir')
 pkgconfigdir = join_paths(libdir, 'pkgconfig')
 
diff --git a/meson.sh b/meson.sh
index a8684f03..f0db2a19 100755
--- a/meson.sh
+++ b/meson.sh
@@ -28,7 +28,7 @@ install uninstall:
 	echo "meson install support not yet completed" && false
 
 docs:
-	ninja -C build intel-gpu-tools-doc
+	ninja -C build igt-gpu-tools-doc
 
 EOF