diff --git a/modules/cudawarping/CMakeLists.txt b/modules/cudawarping/CMakeLists.txt
new file mode 100644
index 000000000000..6aedc28518bf
--- /dev/null
+++ b/modules/cudawarping/CMakeLists.txt
@@ -0,0 +1,9 @@
+if(ANDROID OR IOS)
+  ocv_module_disable(cudawarping)
+endif()
+
+set(the_description "CUDA-accelerated Image Warping")
+
+ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations)
+
+ocv_define_module(cudawarping opencv_imgproc OPTIONAL opencv_cudalegacy)
diff --git a/modules/gpuwarping/doc/gpuwarping.rst b/modules/cudawarping/doc/cudawarping.rst
similarity index 100%
rename from modules/gpuwarping/doc/gpuwarping.rst
rename to modules/cudawarping/doc/cudawarping.rst
diff --git a/modules/gpuwarping/doc/warping.rst b/modules/cudawarping/doc/warping.rst
similarity index 100%
rename from modules/gpuwarping/doc/warping.rst
rename to modules/cudawarping/doc/warping.rst
diff --git a/modules/gpuwarping/include/opencv2/gpuwarping.hpp b/modules/cudawarping/include/opencv2/cudawarping.hpp
similarity index 97%
rename from modules/gpuwarping/include/opencv2/gpuwarping.hpp
rename to modules/cudawarping/include/opencv2/cudawarping.hpp
index 6b5ab03308eb..d759f5559860 100644
--- a/modules/gpuwarping/include/opencv2/gpuwarping.hpp
+++ b/modules/cudawarping/include/opencv2/cudawarping.hpp
@@ -40,11 +40,11 @@
 //
 //M*/
 
-#ifndef __OPENCV_GPUWARPING_HPP__
-#define __OPENCV_GPUWARPING_HPP__
+#ifndef __OPENCV_CUDAWARPING_HPP__
+#define __OPENCV_CUDAWARPING_HPP__
 
 #ifndef __cplusplus
-#  error gpuwarping.hpp header must be compiled as C++
+#  error cudawarping.hpp header must be compiled as C++
 #endif
 
 #include "opencv2/core/cuda.hpp"
@@ -110,4 +110,4 @@ CV_EXPORTS Ptr<ImagePyramid> createImagePyramid(InputArray img, int nLayers = -1
 
 }} // namespace cv { namespace cuda {
 
-#endif /* __OPENCV_GPUWARPING_HPP__ */
+#endif /* __OPENCV_CUDAWARPING_HPP__ */
diff --git a/modules/gpuwarping/perf/perf_main.cpp b/modules/cudawarping/perf/perf_main.cpp
similarity index 98%
rename from modules/gpuwarping/perf/perf_main.cpp
rename to modules/cudawarping/perf/perf_main.cpp
index 8566b097d4f3..831844491c3e 100644
--- a/modules/gpuwarping/perf/perf_main.cpp
+++ b/modules/cudawarping/perf/perf_main.cpp
@@ -44,4 +44,4 @@
 
 using namespace perf;
 
-CV_PERF_TEST_CUDA_MAIN(gpuwarping)
+CV_PERF_TEST_CUDA_MAIN(cudawarping)
diff --git a/modules/gpuwarping/perf/perf_precomp.cpp b/modules/cudawarping/perf/perf_precomp.cpp
similarity index 100%
rename from modules/gpuwarping/perf/perf_precomp.cpp
rename to modules/cudawarping/perf/perf_precomp.cpp
diff --git a/modules/gpuwarping/perf/perf_precomp.hpp b/modules/cudawarping/perf/perf_precomp.hpp
similarity index 98%
rename from modules/gpuwarping/perf/perf_precomp.hpp
rename to modules/cudawarping/perf/perf_precomp.hpp
index fc46b264749f..49970847605c 100644
--- a/modules/gpuwarping/perf/perf_precomp.hpp
+++ b/modules/cudawarping/perf/perf_precomp.hpp
@@ -54,7 +54,7 @@
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/gpu_perf.hpp"
 
-#include "opencv2/gpuwarping.hpp"
+#include "opencv2/cudawarping.hpp"
 #include "opencv2/imgproc.hpp"
 
 #ifdef GTEST_CREATE_SHARED_LIBRARY
diff --git a/modules/gpuwarping/perf/perf_warping.cpp b/modules/cudawarping/perf/perf_warping.cpp
similarity index 100%
rename from modules/gpuwarping/perf/perf_warping.cpp
rename to modules/cudawarping/perf/perf_warping.cpp
diff --git a/modules/gpuwarping/src/cuda/build_warp_maps.cu b/modules/cudawarping/src/cuda/build_warp_maps.cu
similarity index 100%
rename from modules/gpuwarping/src/cuda/build_warp_maps.cu
rename to modules/cudawarping/src/cuda/build_warp_maps.cu
diff --git a/modules/gpuwarping/src/cuda/pyr_down.cu b/modules/cudawarping/src/cuda/pyr_down.cu
similarity index 100%
rename from modules/gpuwarping/src/cuda/pyr_down.cu
rename to modules/cudawarping/src/cuda/pyr_down.cu
diff --git a/modules/gpuwarping/src/cuda/pyr_up.cu b/modules/cudawarping/src/cuda/pyr_up.cu
similarity index 100%
rename from modules/gpuwarping/src/cuda/pyr_up.cu
rename to modules/cudawarping/src/cuda/pyr_up.cu
diff --git a/modules/gpuwarping/src/cuda/remap.cu b/modules/cudawarping/src/cuda/remap.cu
similarity index 100%
rename from modules/gpuwarping/src/cuda/remap.cu
rename to modules/cudawarping/src/cuda/remap.cu
diff --git a/modules/gpuwarping/src/cuda/resize.cu b/modules/cudawarping/src/cuda/resize.cu
similarity index 100%
rename from modules/gpuwarping/src/cuda/resize.cu
rename to modules/cudawarping/src/cuda/resize.cu
diff --git a/modules/gpuwarping/src/cuda/warp.cu b/modules/cudawarping/src/cuda/warp.cu
similarity index 100%
rename from modules/gpuwarping/src/cuda/warp.cu
rename to modules/cudawarping/src/cuda/warp.cu
diff --git a/modules/gpuwarping/src/precomp.cpp b/modules/cudawarping/src/precomp.cpp
similarity index 100%
rename from modules/gpuwarping/src/precomp.cpp
rename to modules/cudawarping/src/precomp.cpp
diff --git a/modules/gpuwarping/src/precomp.hpp b/modules/cudawarping/src/precomp.hpp
similarity index 98%
rename from modules/gpuwarping/src/precomp.hpp
rename to modules/cudawarping/src/precomp.hpp
index d2e647113624..9f5b0c152955 100644
--- a/modules/gpuwarping/src/precomp.hpp
+++ b/modules/cudawarping/src/precomp.hpp
@@ -43,7 +43,7 @@
 #ifndef __OPENCV_PRECOMP_H__
 #define __OPENCV_PRECOMP_H__
 
-#include "opencv2/gpuwarping.hpp"
+#include "opencv2/cudawarping.hpp"
 
 #include "opencv2/core/private.cuda.hpp"
 
diff --git a/modules/gpuwarping/src/pyramids.cpp b/modules/cudawarping/src/pyramids.cpp
similarity index 100%
rename from modules/gpuwarping/src/pyramids.cpp
rename to modules/cudawarping/src/pyramids.cpp
diff --git a/modules/gpuwarping/src/remap.cpp b/modules/cudawarping/src/remap.cpp
similarity index 100%
rename from modules/gpuwarping/src/remap.cpp
rename to modules/cudawarping/src/remap.cpp
diff --git a/modules/gpuwarping/src/resize.cpp b/modules/cudawarping/src/resize.cpp
similarity index 100%
rename from modules/gpuwarping/src/resize.cpp
rename to modules/cudawarping/src/resize.cpp
diff --git a/modules/gpuwarping/src/warp.cpp b/modules/cudawarping/src/warp.cpp
similarity index 100%
rename from modules/gpuwarping/src/warp.cpp
rename to modules/cudawarping/src/warp.cpp
diff --git a/modules/gpuwarping/test/interpolation.hpp b/modules/cudawarping/test/interpolation.hpp
similarity index 100%
rename from modules/gpuwarping/test/interpolation.hpp
rename to modules/cudawarping/test/interpolation.hpp
diff --git a/modules/gpuwarping/test/test_main.cpp b/modules/cudawarping/test/test_main.cpp
similarity index 100%
rename from modules/gpuwarping/test/test_main.cpp
rename to modules/cudawarping/test/test_main.cpp
diff --git a/modules/gpuwarping/test/test_precomp.cpp b/modules/cudawarping/test/test_precomp.cpp
similarity index 100%
rename from modules/gpuwarping/test/test_precomp.cpp
rename to modules/cudawarping/test/test_precomp.cpp
diff --git a/modules/gpuwarping/test/test_precomp.hpp b/modules/cudawarping/test/test_precomp.hpp
similarity index 98%
rename from modules/gpuwarping/test/test_precomp.hpp
rename to modules/cudawarping/test/test_precomp.hpp
index 9ac7fc0b838e..c4d2c13e6ed8 100644
--- a/modules/gpuwarping/test/test_precomp.hpp
+++ b/modules/cudawarping/test/test_precomp.hpp
@@ -54,7 +54,7 @@
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/gpu_test.hpp"
 
-#include "opencv2/gpuwarping.hpp"
+#include "opencv2/cudawarping.hpp"
 #include "opencv2/imgproc.hpp"
 
 #include "cvconfig.h"
diff --git a/modules/gpuwarping/test/test_pyramids.cpp b/modules/cudawarping/test/test_pyramids.cpp
similarity index 100%
rename from modules/gpuwarping/test/test_pyramids.cpp
rename to modules/cudawarping/test/test_pyramids.cpp
diff --git a/modules/gpuwarping/test/test_remap.cpp b/modules/cudawarping/test/test_remap.cpp
similarity index 100%
rename from modules/gpuwarping/test/test_remap.cpp
rename to modules/cudawarping/test/test_remap.cpp
diff --git a/modules/gpuwarping/test/test_resize.cpp b/modules/cudawarping/test/test_resize.cpp
similarity index 100%
rename from modules/gpuwarping/test/test_resize.cpp
rename to modules/cudawarping/test/test_resize.cpp
diff --git a/modules/gpuwarping/test/test_warp_affine.cpp b/modules/cudawarping/test/test_warp_affine.cpp
similarity index 100%
rename from modules/gpuwarping/test/test_warp_affine.cpp
rename to modules/cudawarping/test/test_warp_affine.cpp
diff --git a/modules/gpuwarping/test/test_warp_perspective.cpp b/modules/cudawarping/test/test_warp_perspective.cpp
similarity index 100%
rename from modules/gpuwarping/test/test_warp_perspective.cpp
rename to modules/cudawarping/test/test_warp_perspective.cpp
diff --git a/modules/gpu/CMakeLists.txt b/modules/gpu/CMakeLists.txt
index 17594604005f..de547354a42b 100644
--- a/modules/gpu/CMakeLists.txt
+++ b/modules/gpu/CMakeLists.txt
@@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Computer Vision")
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4100 /wd4324 /wd4512 /wd4515 -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter)
 
-ocv_define_module(gpu opencv_calib3d opencv_objdetect opencv_cudaarithm opencv_gpuwarping OPTIONAL opencv_cudalegacy)
+ocv_define_module(gpu opencv_calib3d opencv_objdetect opencv_cudaarithm opencv_cudawarping OPTIONAL opencv_cudalegacy)
diff --git a/modules/gpu/src/precomp.hpp b/modules/gpu/src/precomp.hpp
index 4407b07ea6e3..3ab36102bbf1 100644
--- a/modules/gpu/src/precomp.hpp
+++ b/modules/gpu/src/precomp.hpp
@@ -45,7 +45,7 @@
 
 #include "opencv2/gpu.hpp"
 #include "opencv2/cudaarithm.hpp"
-#include "opencv2/gpuwarping.hpp"
+#include "opencv2/cudawarping.hpp"
 #include "opencv2/calib3d.hpp"
 #include "opencv2/objdetect.hpp"
 
diff --git a/modules/gpufeatures2d/CMakeLists.txt b/modules/gpufeatures2d/CMakeLists.txt
index 641f864cd403..678ff6a41049 100644
--- a/modules/gpufeatures2d/CMakeLists.txt
+++ b/modules/gpufeatures2d/CMakeLists.txt
@@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Feature Detection and Description")
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4100 /wd4324 /wd4512 /wd4515 -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter)
 
-ocv_define_module(gpufeatures2d opencv_features2d opencv_gpufilters opencv_gpuwarping)
+ocv_define_module(gpufeatures2d opencv_features2d opencv_gpufilters opencv_cudawarping)
diff --git a/modules/gpufeatures2d/src/precomp.hpp b/modules/gpufeatures2d/src/precomp.hpp
index 90ffc3f2728c..9aedd2bd77ff 100644
--- a/modules/gpufeatures2d/src/precomp.hpp
+++ b/modules/gpufeatures2d/src/precomp.hpp
@@ -49,7 +49,7 @@
 
 #include "opencv2/gpufeatures2d.hpp"
 #include "opencv2/cudaarithm.hpp"
-#include "opencv2/gpuwarping.hpp"
+#include "opencv2/cudawarping.hpp"
 #include "opencv2/features2d.hpp"
 
 #include "opencv2/core/private.cuda.hpp"
diff --git a/modules/gpuoptflow/CMakeLists.txt b/modules/gpuoptflow/CMakeLists.txt
index 30a7e4aee333..2d9ac3eb2c2c 100644
--- a/modules/gpuoptflow/CMakeLists.txt
+++ b/modules/gpuoptflow/CMakeLists.txt
@@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Optical Flow")
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations)
 
-ocv_define_module(gpuoptflow opencv_video opencv_legacy opencv_cudaarithm opencv_gpuwarping opencv_gpuimgproc OPTIONAL opencv_cudalegacy)
+ocv_define_module(gpuoptflow opencv_video opencv_legacy opencv_cudaarithm opencv_cudawarping opencv_gpuimgproc OPTIONAL opencv_cudalegacy)
diff --git a/modules/gpuoptflow/src/precomp.hpp b/modules/gpuoptflow/src/precomp.hpp
index 3e9d88a5b7ab..a0a03f7c4690 100644
--- a/modules/gpuoptflow/src/precomp.hpp
+++ b/modules/gpuoptflow/src/precomp.hpp
@@ -47,7 +47,7 @@
 
 #include "opencv2/gpuoptflow.hpp"
 #include "opencv2/cudaarithm.hpp"
-#include "opencv2/gpuwarping.hpp"
+#include "opencv2/cudawarping.hpp"
 #include "opencv2/gpuimgproc.hpp"
 #include "opencv2/video.hpp"
 
diff --git a/modules/gpuwarping/CMakeLists.txt b/modules/gpuwarping/CMakeLists.txt
deleted file mode 100644
index 2fd74ab4d8d4..000000000000
--- a/modules/gpuwarping/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-if(ANDROID OR IOS)
-  ocv_module_disable(gpuwarping)
-endif()
-
-set(the_description "GPU-accelerated Image Warping")
-
-ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations)
-
-ocv_define_module(gpuwarping opencv_imgproc OPTIONAL opencv_cudalegacy)
diff --git a/modules/stitching/include/opencv2/stitching/detail/warpers.hpp b/modules/stitching/include/opencv2/stitching/detail/warpers.hpp
index b55d20637d85..8906d88a3cf9 100644
--- a/modules/stitching/include/opencv2/stitching/detail/warpers.hpp
+++ b/modules/stitching/include/opencv2/stitching/detail/warpers.hpp
@@ -327,7 +327,7 @@ class CV_EXPORTS TransverseMercatorWarper : public RotationWarperBase<Transverse
 };
 
 
-#ifdef HAVE_OPENCV_GPUWARPING
+#ifdef HAVE_OPENCV_CUDAWARPING
 class CV_EXPORTS PlaneWarperGpu : public PlaneWarper
 {
 public:
diff --git a/modules/stitching/include/opencv2/stitching/warpers.hpp b/modules/stitching/include/opencv2/stitching/warpers.hpp
index 9d62d356bc4d..0dae219bb137 100644
--- a/modules/stitching/include/opencv2/stitching/warpers.hpp
+++ b/modules/stitching/include/opencv2/stitching/warpers.hpp
@@ -145,7 +145,7 @@ class TransverseMercatorWarper: public WarperCreator
 
 
 
-#ifdef HAVE_OPENCV_GPUWARPING
+#ifdef HAVE_OPENCV_CUDAWARPING
 class PlaneWarperGpu: public WarperCreator
 {
 public:
diff --git a/modules/stitching/src/blenders.cpp b/modules/stitching/src/blenders.cpp
index ffff71460b39..ca4b99132366 100644
--- a/modules/stitching/src/blenders.cpp
+++ b/modules/stitching/src/blenders.cpp
@@ -188,7 +188,7 @@ MultiBandBlender::MultiBandBlender(int try_gpu, int num_bands, int weight_type)
 {
     setNumBands(num_bands);
 
-#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUWARPING)
+#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_CUDAWARPING)
     can_use_gpu_ = try_gpu && cuda::getCudaEnabledDeviceCount();
 #else
     (void) try_gpu;
@@ -491,7 +491,7 @@ void createLaplacePyr(const Mat &img, int num_levels, std::vector<Mat> &pyr)
 
 void createLaplacePyrGpu(const Mat &img, int num_levels, std::vector<Mat> &pyr)
 {
-#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUWARPING)
+#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_CUDAWARPING)
     pyr.resize(num_levels + 1);
 
     std::vector<cuda::GpuMat> gpu_pyr(num_levels + 1);
@@ -531,7 +531,7 @@ void restoreImageFromLaplacePyr(std::vector<Mat> &pyr)
 
 void restoreImageFromLaplacePyrGpu(std::vector<Mat> &pyr)
 {
-#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUWARPING)
+#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_CUDAWARPING)
     if (pyr.empty())
         return;
 
diff --git a/modules/stitching/src/precomp.hpp b/modules/stitching/src/precomp.hpp
index c2dbd11dfd86..c23ede0c5d94 100644
--- a/modules/stitching/src/precomp.hpp
+++ b/modules/stitching/src/precomp.hpp
@@ -72,8 +72,8 @@
 #  include "opencv2/cudaarithm.hpp"
 #endif
 
-#ifdef HAVE_OPENCV_GPUWARPING
-#  include "opencv2/gpuwarping.hpp"
+#ifdef HAVE_OPENCV_CUDAWARPING
+#  include "opencv2/cudawarping.hpp"
 #endif
 
 #ifdef HAVE_OPENCV_GPUFEATURES2D
diff --git a/modules/stitching/src/warpers.cpp b/modules/stitching/src/warpers.cpp
index e09790f00e7e..3f71f204052c 100644
--- a/modules/stitching/src/warpers.cpp
+++ b/modules/stitching/src/warpers.cpp
@@ -210,7 +210,7 @@ void SphericalWarper::detectResultRoi(Size src_size, Point &dst_tl, Point &dst_b
 }
 
 
-#ifdef HAVE_OPENCV_GPUWARPING
+#ifdef HAVE_OPENCV_CUDAWARPING
 Rect PlaneWarperGpu::buildMaps(Size src_size, const Mat &K, const Mat &R, cuda::GpuMat &xmap, cuda::GpuMat &ymap)
 {
     return buildMaps(src_size, K, R, Mat::zeros(3, 1, CV_32F), xmap, ymap);
diff --git a/modules/superres/CMakeLists.txt b/modules/superres/CMakeLists.txt
index a1c0dde00b85..d4eaaf7eecd3 100644
--- a/modules/superres/CMakeLists.txt
+++ b/modules/superres/CMakeLists.txt
@@ -6,4 +6,4 @@ set(the_description "Super Resolution")
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 -Wundef)
 ocv_define_module(superres opencv_imgproc opencv_video
                   OPTIONAL opencv_highgui opencv_ocl
-                  opencv_cudaarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc opencv_gpuoptflow opencv_cudacodec)
+                  opencv_cudaarithm opencv_gpufilters opencv_cudawarping opencv_gpuimgproc opencv_gpuoptflow opencv_cudacodec)
diff --git a/modules/superres/src/btv_l1_gpu.cpp b/modules/superres/src/btv_l1_gpu.cpp
index e968e9d7901d..e0ec64d8996b 100644
--- a/modules/superres/src/btv_l1_gpu.cpp
+++ b/modules/superres/src/btv_l1_gpu.cpp
@@ -50,7 +50,7 @@ using namespace cv::cuda;
 using namespace cv::superres;
 using namespace cv::superres::detail;
 
-#if !defined(HAVE_CUDA) || !defined(HAVE_OPENCV_CUDAARITHM) || !defined(HAVE_OPENCV_GPUWARPING) || !defined(HAVE_OPENCV_GPUFILTERS)
+#if !defined(HAVE_CUDA) || !defined(HAVE_OPENCV_CUDAARITHM) || !defined(HAVE_OPENCV_CUDAWARPING) || !defined(HAVE_OPENCV_GPUFILTERS)
 
 Ptr<SuperResolution> cv::superres::createSuperResolution_BTVL1_GPU()
 {
diff --git a/modules/superres/src/cuda/btv_l1_gpu.cu b/modules/superres/src/cuda/btv_l1_gpu.cu
index d370a68c8740..f79ee8d8c515 100644
--- a/modules/superres/src/cuda/btv_l1_gpu.cu
+++ b/modules/superres/src/cuda/btv_l1_gpu.cu
@@ -42,7 +42,7 @@
 
 #include "opencv2/opencv_modules.hpp"
 
-#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUWARPING) && defined(HAVE_OPENCV_GPUFILTERS)
+#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_CUDAWARPING) && defined(HAVE_OPENCV_GPUFILTERS)
 
 #include "opencv2/core/cuda/common.hpp"
 #include "opencv2/core/cuda/transform.hpp"
diff --git a/modules/superres/src/precomp.hpp b/modules/superres/src/precomp.hpp
index 89a1e132cb91..7b045ff1a1a3 100644
--- a/modules/superres/src/precomp.hpp
+++ b/modules/superres/src/precomp.hpp
@@ -61,8 +61,8 @@
 #  include "opencv2/cudaarithm.hpp"
 #endif
 
-#ifdef HAVE_OPENCV_GPUWARPING
-#  include "opencv2/gpuwarping.hpp"
+#ifdef HAVE_OPENCV_CUDAWARPING
+#  include "opencv2/cudawarping.hpp"
 #endif
 
 #ifdef HAVE_OPENCV_GPUFILTERS
diff --git a/modules/superres/test/test_superres.cpp b/modules/superres/test/test_superres.cpp
index 541ec5524fad..2a2774feb6db 100644
--- a/modules/superres/test/test_superres.cpp
+++ b/modules/superres/test/test_superres.cpp
@@ -268,7 +268,7 @@ TEST_F(SuperResolution, BTVL1)
     RunTest(cv::superres::createSuperResolution_BTVL1());
 }
 
-#if defined(HAVE_CUDA) && defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUWARPING) && defined(HAVE_OPENCV_GPUFILTERS)
+#if defined(HAVE_CUDA) && defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_CUDAWARPING) && defined(HAVE_OPENCV_GPUFILTERS)
 
 TEST_F(SuperResolution, BTVL1_GPU)
 {
diff --git a/modules/videostab/CMakeLists.txt b/modules/videostab/CMakeLists.txt
index 4df203c7dd8c..9c57e5601049 100644
--- a/modules/videostab/CMakeLists.txt
+++ b/modules/videostab/CMakeLists.txt
@@ -1,3 +1,3 @@
 set(the_description "Video stabilization")
 ocv_define_module(videostab opencv_imgproc opencv_features2d opencv_video opencv_photo opencv_calib3d
-                  OPTIONAL opencv_gpu opencv_gpuwarping opencv_gpuoptflow opencv_highgui)
+                  OPTIONAL opencv_gpu opencv_cudawarping opencv_gpuoptflow opencv_highgui)
diff --git a/modules/videostab/src/wobble_suppression.cpp b/modules/videostab/src/wobble_suppression.cpp
index 66bfcf5a44a4..99e9db7297fe 100644
--- a/modules/videostab/src/wobble_suppression.cpp
+++ b/modules/videostab/src/wobble_suppression.cpp
@@ -44,8 +44,8 @@
 #include "opencv2/videostab/wobble_suppression.hpp"
 #include "opencv2/videostab/ring_buffer.hpp"
 
-#ifdef HAVE_OPENCV_GPUWARPING
-#  include "opencv2/gpuwarping.hpp"
+#ifdef HAVE_OPENCV_CUDAWARPING
+#  include "opencv2/cudawarping.hpp"
 #endif
 
 #ifdef HAVE_OPENCV_GPU
@@ -122,7 +122,7 @@ void MoreAccurateMotionWobbleSuppressor::suppress(int idx, const Mat &frame, Mat
 }
 
 
-#ifdef HAVE_OPENCV_GPUWARPING
+#ifdef HAVE_OPENCV_CUDAWARPING
 void MoreAccurateMotionWobbleSuppressorGpu::suppress(int idx, const cuda::GpuMat &frame, cuda::GpuMat &result)
 {
     CV_Assert(motions_ && stabilizationMotions_);
diff --git a/samples/cpp/stitching_detailed.cpp b/samples/cpp/stitching_detailed.cpp
index c9668198f53b..2fa5117c4bd9 100644
--- a/samples/cpp/stitching_detailed.cpp
+++ b/samples/cpp/stitching_detailed.cpp
@@ -552,7 +552,7 @@ int main(int argc, char* argv[])
     // Warp images and their masks
 
     Ptr<WarperCreator> warper_creator;
-#ifdef HAVE_OPENCV_GPUWARPING
+#ifdef HAVE_OPENCV_CUDAWARPING
     if (try_gpu && cuda::getCudaEnabledDeviceCount() > 0)
     {
         if (warp_type == "plane") warper_creator = new cv::PlaneWarperGpu();
diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt
index 9d47cfe0d114..1f23fb693c28 100644
--- a/samples/gpu/CMakeLists.txt
+++ b/samples/gpu/CMakeLists.txt
@@ -2,7 +2,7 @@ SET(OPENCV_GPU_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc ope
                                      opencv_ml opencv_video opencv_objdetect opencv_features2d
                                      opencv_calib3d opencv_legacy opencv_contrib opencv_gpu
                                      opencv_nonfree opencv_softcascade opencv_superres
-                                     opencv_cudaarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc
+                                     opencv_cudaarithm opencv_gpufilters opencv_cudawarping opencv_gpuimgproc
                                      opencv_gpufeatures2d opencv_gpuoptflow opencv_gpubgsegm
                                      opencv_gpustereo opencv_cudalegacy)
 
diff --git a/samples/gpu/cascadeclassifier.cpp b/samples/gpu/cascadeclassifier.cpp
index be42de84de2f..34d317c25f55 100644
--- a/samples/gpu/cascadeclassifier.cpp
+++ b/samples/gpu/cascadeclassifier.cpp
@@ -12,7 +12,7 @@
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/gpu.hpp"
 #include "opencv2/gpuimgproc.hpp"
-#include "opencv2/gpuwarping.hpp"
+#include "opencv2/cudawarping.hpp"
 
 using namespace std;
 using namespace cv;
diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp
index 12f098390a66..043a1370895c 100644
--- a/samples/gpu/performance/tests.cpp
+++ b/samples/gpu/performance/tests.cpp
@@ -6,7 +6,7 @@
 #include "opencv2/gpu.hpp"
 #include "opencv2/gpuimgproc.hpp"
 #include "opencv2/cudaarithm.hpp"
-#include "opencv2/gpuwarping.hpp"
+#include "opencv2/cudawarping.hpp"
 #include "opencv2/gpufeatures2d.hpp"
 #include "opencv2/gpufilters.hpp"
 #include "opencv2/gpuoptflow.hpp"