diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d60c3aa..a8940f20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,13 +7,13 @@ test-kvazaar: &test-template
   script:
     - bash .travis-install.bash
     - export PATH="${HOME}/bin:${PATH}"
-    - ./autogen.sh
+    - cmake .
     - ./configure --enable-werror || (cat config.log && false)
     - make --jobs=8
     - make check --jobs=8 VERBOSE=1
   artifacts:
     paths:
-    - src/kvazaar
+    - src/uvg266
     - src/.libs
     expire_in: 1 week
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f1b4078..2b8001bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ HOMEPAGE_URL https://github.com/ultravideo/uvg266
 DESCRIPTION "An open-source VVC encoder licensed under 3-clause BSD"
 VERSION 0.2.3)
 
-configure_file("${PROJECT_SOURCE_DIR}/src/kvazaar.pc.in" "${PROJECT_SOURCE_DIR}/src/kvazaar.pc" @ONLY) 
+configure_file("${PROJECT_SOURCE_DIR}/src/uvg266.pc.in" "${PROJECT_SOURCE_DIR}/src/uvg266.pc" @ONLY) 
 
 option(USE_SHARED_LIB "Build using shared uvg266 library" ON)
 
diff --git a/src/alf.h b/src/alf.h
index 58bff39d..a95be1af 100644
--- a/src/alf.h
+++ b/src/alf.h
@@ -6,7 +6,7 @@
 #include "encoder.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "videoframe.h"
 #include "image.h"
 #include "nal.h"
diff --git a/src/bitstream.h b/src/bitstream.h
index 961923c9..b3c7c2c2 100644
--- a/src/bitstream.h
+++ b/src/bitstream.h
@@ -40,7 +40,7 @@
 
 #include "global.h" // IWYU pragma: keep
 
-#include "kvazaar.h"
+#include "uvg266.h"
 
 
 /**
diff --git a/src/cabac.c b/src/cabac.c
index 836193d9..c5b28090 100644
--- a/src/cabac.c
+++ b/src/cabac.c
@@ -34,7 +34,7 @@
 
 #include "encoder.h"
 #include "encoderstate.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 
 #ifdef UVG_DEBUG_PRINT_CABAC
 uint32_t uvg_cabac_bins_count = 0;
diff --git a/src/cfg.h b/src/cfg.h
index 21bec6b4..d0ebd991 100644
--- a/src/cfg.h
+++ b/src/cfg.h
@@ -40,7 +40,7 @@
 
 #include "global.h" // IWYU pragma: keep
 
-#include "kvazaar.h"
+#include "uvg266.h"
 
 /* Function definitions */
 uvg_config *uvg_config_alloc(void);
diff --git a/src/cli.h b/src/cli.h
index 29a45227..26859213 100644
--- a/src/cli.h
+++ b/src/cli.h
@@ -38,7 +38,7 @@
  */
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 typedef struct cmdline_opts_t {
   /** \brief Input filename */
diff --git a/src/cu.h b/src/cu.h
index 7cc88595..d1d3ae6d 100644
--- a/src/cu.h
+++ b/src/cu.h
@@ -40,7 +40,7 @@
 
 #include "global.h" // IWYU pragma: keep
 #include "image.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 
 
 //Cu stuff
diff --git a/src/encmain.c b/src/encmain.c
index d54a9587..21aa0cce 100644
--- a/src/encmain.c
+++ b/src/encmain.c
@@ -57,8 +57,8 @@
 #include "cli.h"
 #include "debug.h"
 #include "encoder.h"
-#include "kvazaar.h"
-#include "kvazaar_internal.h"
+#include "uvg266.h"
+#include "uvg266_internal.h"
 #include "threads.h"
 #include "yuv_io.h"
 
diff --git a/src/encode_coding_tree.c b/src/encode_coding_tree.c
index 46628c6a..fa789032 100644
--- a/src/encode_coding_tree.c
+++ b/src/encode_coding_tree.c
@@ -41,7 +41,7 @@
 #include "imagelist.h"
 #include "inter.h"
 #include "intra.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "uvg_math.h"
 #include "strategyselector.h"
 #include "tables.h"
diff --git a/src/encoder.h b/src/encoder.h
index 2f82343a..86bf2529 100644
--- a/src/encoder.h
+++ b/src/encoder.h
@@ -39,7 +39,7 @@
  */
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "scalinglist.h"
 #include "threadqueue.h"
 #include "fast_coeff_cost.h"
diff --git a/src/encoder_state-bitstream.c b/src/encoder_state-bitstream.c
index c37602c9..57a80e54 100644
--- a/src/encoder_state-bitstream.c
+++ b/src/encoder_state-bitstream.c
@@ -45,7 +45,7 @@
 #include "encoder_state-geometry.h"
 #include "encoderstate.h"
 #include "imagelist.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "uvg_math.h"
 #include "nal.h"
 #include "scalinglist.h"
diff --git a/src/encoder_state-ctors_dtors.c b/src/encoder_state-ctors_dtors.c
index c936e8df..b8d5e656 100644
--- a/src/encoder_state-ctors_dtors.c
+++ b/src/encoder_state-ctors_dtors.c
@@ -44,7 +44,7 @@
 #include "encoderstate.h"
 #include "image.h"
 #include "imagelist.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "threadqueue.h"
 #include "videoframe.h"
 #include "rate_control.h"
diff --git a/src/encoderstate.h b/src/encoderstate.h
index f24441bd..620af515 100644
--- a/src/encoderstate.h
+++ b/src/encoderstate.h
@@ -45,7 +45,7 @@
 #include "global.h" // IWYU pragma: keep
 #include "image.h"
 #include "imagelist.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "tables.h"
 #include "threadqueue.h"
 #include "videoframe.h"
diff --git a/src/fast_coeff_cost.c b/src/fast_coeff_cost.c
index d72c6115..f077ec21 100644
--- a/src/fast_coeff_cost.c
+++ b/src/fast_coeff_cost.c
@@ -31,7 +31,7 @@
  ****************************************************************************/
  
 #include "fast_coeff_cost.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "encoderstate.h"
 
 // Note: Assumes that costs are non-negative, for pretty obvious reasons
diff --git a/src/fast_coeff_cost.h b/src/fast_coeff_cost.h
index 5345a5bd..0639a34c 100644
--- a/src/fast_coeff_cost.h
+++ b/src/fast_coeff_cost.h
@@ -34,7 +34,7 @@
 #define FAST_COEFF_COST_H_
 
 #include <stdio.h>
-#include "kvazaar.h"
+#include "uvg266.h"
 // #include "encoderstate.h"
 
 #define MAX_FAST_COEFF_COST_QP 50
diff --git a/src/filter.c b/src/filter.c
index 3e045ba2..656b7889 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -36,7 +36,7 @@
 
 #include "cu.h"
 #include "encoder.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "transform.h"
 #include "videoframe.h"
 
diff --git a/src/gop.h b/src/gop.h
index a309797f..f56d3619 100644
--- a/src/gop.h
+++ b/src/gop.h
@@ -32,7 +32,7 @@
  * INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS
  ****************************************************************************/
 
-#include <kvazaar.h>
+#include <uvg266.h>
 
 
 static const uvg_gop_config uvg_gop_lowdelay4[4] = {
diff --git a/src/image.h b/src/image.h
index 8949765d..a7f19bc9 100644
--- a/src/image.h
+++ b/src/image.h
@@ -40,7 +40,7 @@
 
 #include "global.h" // IWYU pragma: keep
 
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "strategies/optimized_sad_func_ptr_t.h"
 
 
diff --git a/src/imagelist.h b/src/imagelist.h
index 079b51ac..fcf73547 100644
--- a/src/imagelist.h
+++ b/src/imagelist.h
@@ -40,7 +40,7 @@
 
 #include "cu.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 
 /**
diff --git a/src/input_frame_buffer.h b/src/input_frame_buffer.h
index 9be28a35..f488c9ee 100644
--- a/src/input_frame_buffer.h
+++ b/src/input_frame_buffer.h
@@ -39,7 +39,7 @@
  */
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 
 // Forward declaration.
diff --git a/src/inter.h b/src/inter.h
index 006444cf..3d3ae797 100644
--- a/src/inter.h
+++ b/src/inter.h
@@ -42,7 +42,7 @@
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
 #include "image.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 
 extern const int8_t uvg_g_imv_to_prec[4];
 
diff --git a/src/intra.h b/src/intra.h
index f517267b..dd90a87b 100644
--- a/src/intra.h
+++ b/src/intra.h
@@ -40,7 +40,7 @@
 #include "cu.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 // Maximum possible reference line length for intra blocks
 #define INTRA_REF_LENGTH (2 * 128 + 3 + 33 * MAX_REF_LINE_IDX)
diff --git a/src/ml_intra_cu_depth_pred.h b/src/ml_intra_cu_depth_pred.h
index 19c3811b..8d0a434e 100644
--- a/src/ml_intra_cu_depth_pred.h
+++ b/src/ml_intra_cu_depth_pred.h
@@ -34,7 +34,7 @@
 
 #include <stdio.h>
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 
 
diff --git a/src/nal.h b/src/nal.h
index ebe54472..a21d7803 100644
--- a/src/nal.h
+++ b/src/nal.h
@@ -40,7 +40,7 @@
 
 #include "bitstream.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 
 #define SEI_HASH_MAX_LENGTH 16
diff --git a/src/rate_control.c b/src/rate_control.c
index 63458493..7c1ff40f 100644
--- a/src/rate_control.c
+++ b/src/rate_control.c
@@ -35,7 +35,7 @@
 #include <math.h>
 
 #include "encoder.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "pthread.h"
 
 
diff --git a/src/reshape.h b/src/reshape.h
index 853428fa..799302cf 100644
--- a/src/reshape.h
+++ b/src/reshape.h
@@ -42,7 +42,7 @@
 #include "encoder.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "videoframe.h"
 #include "image.h"
 #include "nal.h"
diff --git a/src/sao.h b/src/sao.h
index d2d971e3..7a2b4287 100644
--- a/src/sao.h
+++ b/src/sao.h
@@ -43,7 +43,7 @@
 #include "encoder.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "videoframe.h"
 
 
diff --git a/src/search.c b/src/search.c
index bd6ec546..1a47cc39 100644
--- a/src/search.c
+++ b/src/search.c
@@ -40,7 +40,7 @@
 #include "imagelist.h"
 #include "inter.h"
 #include "intra.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "rdo.h"
 #include "search_inter.h"
 #include "search_intra.h"
diff --git a/src/search_inter.c b/src/search_inter.c
index 5868a885..735df1d6 100644
--- a/src/search_inter.c
+++ b/src/search_inter.c
@@ -40,7 +40,7 @@
 #include "image.h"
 #include "imagelist.h"
 #include "inter.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "rdo.h"
 #include "search.h"
 #include "strategies/strategies-ipol.h"
diff --git a/src/search_inter.h b/src/search_inter.h
index 0f956e7c..04b9b3dd 100644
--- a/src/search_inter.h
+++ b/src/search_inter.h
@@ -42,7 +42,7 @@
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
 #include "inter.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 
 #define UVG_LUMA_FILTER_TAPS 8
 #define UVG_LUMA_FILTER_OFFSET 3
diff --git a/src/search_intra.c b/src/search_intra.c
index b35666a4..e89720fb 100644
--- a/src/search_intra.c
+++ b/src/search_intra.c
@@ -39,7 +39,7 @@
 #include "encoderstate.h"
 #include "image.h"
 #include "intra.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "rdo.h"
 #include "search.h"
 #include "strategies/strategies-picture.h"
diff --git a/src/strategies/altivec/picture-altivec.c b/src/strategies/altivec/picture-altivec.c
index a2620da6..a165ac38 100644
--- a/src/strategies/altivec/picture-altivec.c
+++ b/src/strategies/altivec/picture-altivec.c
@@ -38,7 +38,7 @@
 #define bool _Bool
 #include <stdlib.h>
 
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "strategyselector.h"
 
 
diff --git a/src/strategies/avx2/alf-avx2.c b/src/strategies/avx2/alf-avx2.c
index 36eddc10..7502857c 100644
--- a/src/strategies/avx2/alf-avx2.c
+++ b/src/strategies/avx2/alf-avx2.c
@@ -35,7 +35,7 @@
 #include "strategies/avx2/alf-avx2.h"
 
 #if COMPILE_INTEL_AVX2
-#include "kvazaar.h"
+#include "uvg266.h"
 #if UVG_BIT_DEPTH == 8
 
 #include <immintrin.h>
diff --git a/src/strategies/avx2/alf-avx2.h b/src/strategies/avx2/alf-avx2.h
index d5bc1e5d..57d6ce0a 100644
--- a/src/strategies/avx2/alf-avx2.h
+++ b/src/strategies/avx2/alf-avx2.h
@@ -38,7 +38,7 @@
  */
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 int uvg_strategy_register_alf_avx2(void* opaque, uint8_t bitdepth);
 
diff --git a/src/strategies/avx2/dct-avx2.c b/src/strategies/avx2/dct-avx2.c
index 4c89b190..f2d14d2b 100644
--- a/src/strategies/avx2/dct-avx2.c
+++ b/src/strategies/avx2/dct-avx2.c
@@ -37,7 +37,7 @@
 #include "strategies/avx2/dct-avx2.h"
 
 #if COMPILE_INTEL_AVX2
-#include "kvazaar.h"
+#include "uvg266.h"
 #if UVG_BIT_DEPTH == 8
 #include <immintrin.h>
 
diff --git a/src/strategies/avx2/intra-avx2.c b/src/strategies/avx2/intra-avx2.c
index ef5b1fc3..3e8b06bc 100644
--- a/src/strategies/avx2/intra-avx2.c
+++ b/src/strategies/avx2/intra-avx2.c
@@ -33,7 +33,7 @@
 #include "strategies/avx2/intra-avx2.h"
 
 #if COMPILE_INTEL_AVX2 && defined X86_64
-#include "kvazaar.h"
+#include "uvg266.h"
 #if UVG_BIT_DEPTH == 8
 
 #include <immintrin.h>
diff --git a/src/strategies/avx2/ipol-avx2.c b/src/strategies/avx2/ipol-avx2.c
index 3cf272c4..45e675cc 100644
--- a/src/strategies/avx2/ipol-avx2.c
+++ b/src/strategies/avx2/ipol-avx2.c
@@ -42,7 +42,7 @@
 #include <string.h>
 
 #include "encoder.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "search_inter.h"
 #include "strategies/generic/picture-generic.h"
 #include "strategies/strategies-ipol.h"
diff --git a/src/strategies/avx2/picture-avx2.c b/src/strategies/avx2/picture-avx2.c
index 62463a34..9d91066f 100644
--- a/src/strategies/avx2/picture-avx2.c
+++ b/src/strategies/avx2/picture-avx2.c
@@ -37,7 +37,7 @@
 #include "global.h"
 
 #if COMPILE_INTEL_AVX2
-#include "kvazaar.h"
+#include "uvg266.h"
 #if UVG_BIT_DEPTH == 8
 #include "strategies/avx2/picture-avx2.h"
 #include "strategies/avx2/reg_sad_pow2_widths-avx2.h"
diff --git a/src/strategies/avx2/quant-avx2.c b/src/strategies/avx2/quant-avx2.c
index 8092c05c..2d56b8c3 100644
--- a/src/strategies/avx2/quant-avx2.c
+++ b/src/strategies/avx2/quant-avx2.c
@@ -44,7 +44,7 @@
 #include "cu.h"
 #include "encoder.h"
 #include "encoderstate.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "rdo.h"
 #include "scalinglist.h"
 #include "strategies/generic/quant-generic.h"
diff --git a/src/strategies/avx2/reg_sad_pow2_widths-avx2.h b/src/strategies/avx2/reg_sad_pow2_widths-avx2.h
index f71789de..5c41cafb 100644
--- a/src/strategies/avx2/reg_sad_pow2_widths-avx2.h
+++ b/src/strategies/avx2/reg_sad_pow2_widths-avx2.h
@@ -33,7 +33,7 @@
 #ifndef REG_SAD_POW2_WIDTHS_AVX2_H_
 #define REG_SAD_POW2_WIDTHS_AVX2_H_
 
-#include "kvazaar.h"
+#include "uvg266.h"
 
 #if UVG_BIT_DEPTH == 8
 
diff --git a/src/strategies/avx2/sao-avx2.c b/src/strategies/avx2/sao-avx2.c
index 9f0c0bc9..f2c627fa 100644
--- a/src/strategies/avx2/sao-avx2.c
+++ b/src/strategies/avx2/sao-avx2.c
@@ -33,7 +33,7 @@
 #include "strategies/avx2/sao-avx2.h"
 
 #if COMPILE_INTEL_AVX2
-#include "kvazaar.h"
+#include "uvg266.h"
 #if UVG_BIT_DEPTH == 8
 #include <immintrin.h>
 #include <nmmintrin.h>
diff --git a/src/strategies/generic/alf-generic.c b/src/strategies/generic/alf-generic.c
index a7880f71..1fcb0fb1 100644
--- a/src/strategies/generic/alf-generic.c
+++ b/src/strategies/generic/alf-generic.c
@@ -35,7 +35,7 @@
 #include "cu.h"
 #include "encoder.h"
 #include "encoderstate.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "alf.h"
 #include "strategyselector.h"
 
diff --git a/src/strategies/generic/intra-generic.c b/src/strategies/generic/intra-generic.c
index fb57b92f..35494b99 100644
--- a/src/strategies/generic/intra-generic.c
+++ b/src/strategies/generic/intra-generic.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 
 #include "intra.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "strategyselector.h"
 #include "uvg_math.h"
 
diff --git a/src/strategies/generic/ipol-generic.h b/src/strategies/generic/ipol-generic.h
index ab5d135b..63ff0668 100644
--- a/src/strategies/generic/ipol-generic.h
+++ b/src/strategies/generic/ipol-generic.h
@@ -40,7 +40,7 @@
 
 #include "encoder.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 int uvg_strategy_register_ipol_generic(void* opaque, uint8_t bitdepth);
 void uvg_sample_quarterpel_luma_generic(const encoder_control_t * const encoder, uvg_pixel *src, int16_t src_stride, int width, int height, uvg_pixel *dst, int16_t dst_stride, int8_t hor_flag, int8_t ver_flag, const int16_t mv[2]);
diff --git a/src/strategies/generic/nal-generic.c b/src/strategies/generic/nal-generic.c
index 1bbd477d..378f74f6 100644
--- a/src/strategies/generic/nal-generic.c
+++ b/src/strategies/generic/nal-generic.c
@@ -33,7 +33,7 @@
 #include "strategies/generic/nal-generic.h"
 
 #include "extras/libmd5.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "nal.h"
 #include "strategyselector.h"
 
diff --git a/src/strategies/generic/picture-generic.h b/src/strategies/generic/picture-generic.h
index d65976bd..c7d1e066 100644
--- a/src/strategies/generic/picture-generic.h
+++ b/src/strategies/generic/picture-generic.h
@@ -39,7 +39,7 @@
  */
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 int uvg_strategy_register_picture_generic(void* opaque, uint8_t bitdepth);
 
diff --git a/src/strategies/generic/quant-generic.h b/src/strategies/generic/quant-generic.h
index e02b6df8..41b5ccdb 100644
--- a/src/strategies/generic/quant-generic.h
+++ b/src/strategies/generic/quant-generic.h
@@ -41,7 +41,7 @@
 #include "cu.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "tables.h"
 
 #define QUANT_SHIFT 14
diff --git a/src/strategies/generic/sao-generic.c b/src/strategies/generic/sao-generic.c
index 20837cca..4dec1f52 100644
--- a/src/strategies/generic/sao-generic.c
+++ b/src/strategies/generic/sao-generic.c
@@ -36,7 +36,7 @@
 #include "cu.h"
 #include "encoder.h"
 #include "encoderstate.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "sao.h"
 #include "strategyselector.h"
 
diff --git a/src/strategies/generic/sao_shared_generics.h b/src/strategies/generic/sao_shared_generics.h
index fba129c5..ca6ccfd6 100644
--- a/src/strategies/generic/sao_shared_generics.h
+++ b/src/strategies/generic/sao_shared_generics.h
@@ -35,7 +35,7 @@
 
 // #include "encoder.h"
 #include "encoderstate.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "sao.h"
 
 // Mapping of edge_idx values to eo-classes.
diff --git a/src/strategies/optimized_sad_func_ptr_t.h b/src/strategies/optimized_sad_func_ptr_t.h
index 688e41a2..a4c2a6ea 100644
--- a/src/strategies/optimized_sad_func_ptr_t.h
+++ b/src/strategies/optimized_sad_func_ptr_t.h
@@ -1,7 +1,7 @@
 #ifndef OPTIMIZED_SAD_FUNC_T_H_
 #define OPTIMIZED_SAD_FUNC_T_H_
 
-#include "kvazaar.h"
+#include "uvg266.h"
 
 /**
  * \param data1: Picture block pointer
diff --git a/src/strategies/sse2/picture-sse2.c b/src/strategies/sse2/picture-sse2.c
index 8477503c..b87e0d5e 100644
--- a/src/strategies/sse2/picture-sse2.c
+++ b/src/strategies/sse2/picture-sse2.c
@@ -33,7 +33,7 @@
 #include "strategies/sse2/picture-sse2.h"
 
 #if COMPILE_INTEL_SSE2
-#include "kvazaar.h"
+#include "uvg266.h"
 #if UVG_BIT_DEPTH == 8
 #include <immintrin.h>
 #include <stdlib.h>
diff --git a/src/strategies/sse41/alf-sse41.c b/src/strategies/sse41/alf-sse41.c
index 10e8b485..8a8d6cba 100644
--- a/src/strategies/sse41/alf-sse41.c
+++ b/src/strategies/sse41/alf-sse41.c
@@ -33,7 +33,7 @@
 #include "global.h"
 
 #if COMPILE_INTEL_SSE41
-#include "kvazaar.h"
+#include "uvg266.h"
 #if UVG_BIT_DEPTH == 8
 #include "strategies/sse41/alf-sse41.h"
 
diff --git a/src/strategies/sse41/alf-sse41.h b/src/strategies/sse41/alf-sse41.h
index 9550e9eb..209c432c 100644
--- a/src/strategies/sse41/alf-sse41.h
+++ b/src/strategies/sse41/alf-sse41.h
@@ -38,7 +38,7 @@
  */
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 int uvg_strategy_register_alf_sse41(void* opaque, uint8_t bitdepth);
 
diff --git a/src/strategies/sse41/picture-sse41.c b/src/strategies/sse41/picture-sse41.c
index 802e687a..8e1b9d67 100644
--- a/src/strategies/sse41/picture-sse41.c
+++ b/src/strategies/sse41/picture-sse41.c
@@ -33,7 +33,7 @@
 #include "global.h"
 
 #if COMPILE_INTEL_SSE41
-#include "kvazaar.h"
+#include "uvg266.h"
 #if UVG_BIT_DEPTH == 8
 #include "strategies/sse41/picture-sse41.h"
 #include "strategies/sse41/reg_sad_pow2_widths-sse41.h"
diff --git a/src/strategies/sse41/picture-sse41.h b/src/strategies/sse41/picture-sse41.h
index d8855236..c6b208c6 100644
--- a/src/strategies/sse41/picture-sse41.h
+++ b/src/strategies/sse41/picture-sse41.h
@@ -39,7 +39,7 @@
  */
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 unsigned uvg_reg_sad_sse41(const uvg_pixel * const data1, const uvg_pixel * const data2,
                            const int width, const int height, const unsigned stride1, const unsigned stride2);
diff --git a/src/strategies/sse41/reg_sad_pow2_widths-sse41.h b/src/strategies/sse41/reg_sad_pow2_widths-sse41.h
index 5ec1cf63..4b35ea0b 100644
--- a/src/strategies/sse41/reg_sad_pow2_widths-sse41.h
+++ b/src/strategies/sse41/reg_sad_pow2_widths-sse41.h
@@ -33,7 +33,7 @@
 #ifndef REG_SAD_POW2_WIDTHS_SSE41_H_
 #define REG_SAD_POW2_WIDTHS_SSE41_H_
 
-#include "kvazaar.h"
+#include "uvg266.h"
 
 #if UVG_BIT_DEPTH == 8
 
diff --git a/src/strategies/strategies-alf.h b/src/strategies/strategies-alf.h
index 226b2ca8..0d948eb3 100644
--- a/src/strategies/strategies-alf.h
+++ b/src/strategies/strategies-alf.h
@@ -40,7 +40,7 @@
 #include "encoder.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "alf.h"
 
 
diff --git a/src/strategies/strategies-encode.h b/src/strategies/strategies-encode.h
index edd18bc2..5c022462 100644
--- a/src/strategies/strategies-encode.h
+++ b/src/strategies/strategies-encode.h
@@ -41,7 +41,7 @@
 #include "cu.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "tables.h"
 
 
diff --git a/src/strategies/strategies-intra.h b/src/strategies/strategies-intra.h
index 22d27b28..0f7228a0 100644
--- a/src/strategies/strategies-intra.h
+++ b/src/strategies/strategies-intra.h
@@ -40,7 +40,7 @@
 
 #include "global.h" // IWYU pragma: keep
 #include "intra.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 
 
 typedef void (angular_pred_func)(
diff --git a/src/strategies/strategies-ipol.h b/src/strategies/strategies-ipol.h
index 180e2fa6..36775512 100644
--- a/src/strategies/strategies-ipol.h
+++ b/src/strategies/strategies-ipol.h
@@ -40,7 +40,7 @@
 
 #include "encoder.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "search_inter.h"
 
  // AVX2 implementation of horizontal filter reads and
diff --git a/src/strategies/strategies-nal.h b/src/strategies/strategies-nal.h
index 378189b1..f3f8aaf0 100644
--- a/src/strategies/strategies-nal.h
+++ b/src/strategies/strategies-nal.h
@@ -39,7 +39,7 @@
  */
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "nal.h"
 
 
diff --git a/src/strategies/strategies-picture.h b/src/strategies/strategies-picture.h
index a640858d..7a41b68c 100644
--- a/src/strategies/strategies-picture.h
+++ b/src/strategies/strategies-picture.h
@@ -40,7 +40,7 @@
 
 #include "global.h" // IWYU pragma: keep
 #include "inter.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "encoderstate.h"
 #include "strategies/optimized_sad_func_ptr_t.h"
 
diff --git a/src/strategies/strategies-quant.h b/src/strategies/strategies-quant.h
index 9e00f52f..f64b1eac 100644
--- a/src/strategies/strategies-quant.h
+++ b/src/strategies/strategies-quant.h
@@ -41,7 +41,7 @@
 #include "cu.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "tables.h"
 
 // Declare function pointers.
diff --git a/src/strategies/strategies-sao.h b/src/strategies/strategies-sao.h
index fe6e7c1d..ca9f77ba 100644
--- a/src/strategies/strategies-sao.h
+++ b/src/strategies/strategies-sao.h
@@ -41,7 +41,7 @@
 #include "encoder.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "sao.h"
 
 
diff --git a/src/transform.c b/src/transform.c
index 8b526aaf..925964f2 100644
--- a/src/transform.c
+++ b/src/transform.c
@@ -33,7 +33,7 @@
 #include "transform.h"
 
 #include "image.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "rdo.h"
 #include "strategies/strategies-dct.h"
 #include "strategies/strategies-quant.h"
diff --git a/src/kvazaar.c b/src/uvg266.c
similarity index 99%
rename from src/kvazaar.c
rename to src/uvg266.c
index b67b07d0..ed0dfb42 100644
--- a/src/kvazaar.c
+++ b/src/uvg266.c
@@ -30,7 +30,7 @@
  * INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS
  ****************************************************************************/
 
-#include "kvazaar.h"
+#include "uvg266.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -46,7 +46,7 @@
 #include "global.h"
 #include "image.h"
 #include "input_frame_buffer.h"
-#include "kvazaar_internal.h"
+#include "uvg266_internal.h"
 #include "strategyselector.h"
 #include "threadqueue.h"
 #include "videoframe.h"
diff --git a/src/kvazaar.h b/src/uvg266.h
similarity index 100%
rename from src/kvazaar.h
rename to src/uvg266.h
diff --git a/src/kvazaar.pc.in b/src/uvg266.pc.in
similarity index 100%
rename from src/kvazaar.pc.in
rename to src/uvg266.pc.in
diff --git a/src/kvazaar_internal.h b/src/uvg266_internal.h
similarity index 99%
rename from src/kvazaar_internal.h
rename to src/uvg266_internal.h
index 1f8ccfb3..096693b6 100644
--- a/src/kvazaar_internal.h
+++ b/src/uvg266_internal.h
@@ -40,7 +40,7 @@
 
 #include "global.h" // IWYU pragma: keep
 
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "input_frame_buffer.h"
 
 
diff --git a/src/kvz_math.h b/src/uvg_math.h
similarity index 100%
rename from src/kvz_math.h
rename to src/uvg_math.h
diff --git a/src/videoframe.h b/src/videoframe.h
index 3157c962..f328cf6f 100644
--- a/src/videoframe.h
+++ b/src/videoframe.h
@@ -40,7 +40,7 @@
 
 #include "cu.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 
 /**
diff --git a/src/yuv_io.h b/src/yuv_io.h
index 1716cf9a..28f642bb 100644
--- a/src/yuv_io.h
+++ b/src/yuv_io.h
@@ -41,7 +41,7 @@
 #include <stdio.h>
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 int yuv_io_read(FILE* file,
                 unsigned input_width, unsigned input_height,
diff --git a/tests/test_external_symbols.sh b/tests/test_external_symbols.sh
index b9b3d595..96d4c6ca 100755
--- a/tests/test_external_symbols.sh
+++ b/tests/test_external_symbols.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-# Check for external symbols without kvz_ prefix.
+# Check for external symbols without uvg_ prefix.
 
 set -eu${BASH+o pipefail}
 
-if nm -go --defined-only ../src/.libs/libkvazaar.a | grep -v ' kvz_'; then
-    printf '%s\n' 'Only symbols prefixed with "kvz_" should be exported from libkvazaar.'
+if nm -go --defined-only ../src/.libs/libuvg266.a | grep -v ' uvg_'; then
+    printf '%s\n' 'Only symbols prefixed with "uvg_" should be exported from libuvg266.'
     false
 fi