diff --git a/modules/gpucodec/CMakeLists.txt b/modules/cudacodec/CMakeLists.txt
similarity index 78%
rename from modules/gpucodec/CMakeLists.txt
rename to modules/cudacodec/CMakeLists.txt
index 7c3be5c0e0..fd6ed2d1ab 100644
--- a/modules/gpucodec/CMakeLists.txt
+++ b/modules/cudacodec/CMakeLists.txt
@@ -1,12 +1,12 @@
 if(ANDROID OR IOS OR APPLE)
-  ocv_module_disable(gpucodec)
+  ocv_module_disable(cudacodec)
 endif()
 
-set(the_description "GPU-accelerated Video Encoding/Decoding")
+set(the_description "CUDA-accelerated Video Encoding/Decoding")
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations)
 
-ocv_add_module(gpucodec opencv_highgui)
+ocv_add_module(cudacodec opencv_highgui)
 
 ocv_module_include_directories()
 ocv_glob_module_sources()
diff --git a/modules/gpucodec/doc/gpucodec.rst b/modules/cudacodec/doc/cudacodec.rst
similarity index 100%
rename from modules/gpucodec/doc/gpucodec.rst
rename to modules/cudacodec/doc/cudacodec.rst
diff --git a/modules/gpucodec/doc/videodec.rst b/modules/cudacodec/doc/videodec.rst
similarity index 100%
rename from modules/gpucodec/doc/videodec.rst
rename to modules/cudacodec/doc/videodec.rst
diff --git a/modules/gpucodec/doc/videoenc.rst b/modules/cudacodec/doc/videoenc.rst
similarity index 100%
rename from modules/gpucodec/doc/videoenc.rst
rename to modules/cudacodec/doc/videoenc.rst
diff --git a/modules/gpucodec/include/opencv2/gpucodec.hpp b/modules/cudacodec/include/opencv2/cudacodec.hpp
similarity index 97%
rename from modules/gpucodec/include/opencv2/gpucodec.hpp
rename to modules/cudacodec/include/opencv2/cudacodec.hpp
index 51b5161f25..747c044ee5 100644
--- a/modules/gpucodec/include/opencv2/gpucodec.hpp
+++ b/modules/cudacodec/include/opencv2/cudacodec.hpp
@@ -41,11 +41,11 @@
 //
 //M*/
 
-#ifndef __OPENCV_GPUCODEC_HPP__
-#define __OPENCV_GPUCODEC_HPP__
+#ifndef __OPENCV_CUDACODEC_HPP__
+#define __OPENCV_CUDACODEC_HPP__
 
 #ifndef __cplusplus
-#  error gpucodec.hpp header must be compiled as C++
+#  error cudacodec.hpp header must be compiled as C++
 #endif
 
 #include "opencv2/core/cuda.hpp"
@@ -203,4 +203,4 @@ CV_EXPORTS Ptr<VideoReader> createVideoReader(const Ptr<RawVideoSource>& source)
 
 }} // namespace cv { namespace cudacodec {
 
-#endif /* __OPENCV_GPUCODEC_HPP__ */
+#endif /* __OPENCV_CUDACODEC_HPP__ */
diff --git a/modules/gpucodec/perf/perf_main.cpp b/modules/cudacodec/perf/perf_main.cpp
similarity index 98%
rename from modules/gpucodec/perf/perf_main.cpp
rename to modules/cudacodec/perf/perf_main.cpp
index 7839653575..68e91460f7 100644
--- a/modules/gpucodec/perf/perf_main.cpp
+++ b/modules/cudacodec/perf/perf_main.cpp
@@ -44,4 +44,4 @@
 
 using namespace perf;
 
-CV_PERF_TEST_CUDA_MAIN(gpucodec)
+CV_PERF_TEST_CUDA_MAIN(cudacodec)
diff --git a/modules/gpucodec/perf/perf_precomp.cpp b/modules/cudacodec/perf/perf_precomp.cpp
similarity index 100%
rename from modules/gpucodec/perf/perf_precomp.cpp
rename to modules/cudacodec/perf/perf_precomp.cpp
diff --git a/modules/gpucodec/perf/perf_precomp.hpp b/modules/cudacodec/perf/perf_precomp.hpp
similarity index 98%
rename from modules/gpucodec/perf/perf_precomp.hpp
rename to modules/cudacodec/perf/perf_precomp.hpp
index 421fa57633..a431af5c61 100644
--- a/modules/gpucodec/perf/perf_precomp.hpp
+++ b/modules/cudacodec/perf/perf_precomp.hpp
@@ -54,7 +54,7 @@
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/gpu_perf.hpp"
 
-#include "opencv2/gpucodec.hpp"
+#include "opencv2/cudacodec.hpp"
 #include "opencv2/highgui.hpp"
 
 #ifdef GTEST_CREATE_SHARED_LIBRARY
diff --git a/modules/gpucodec/perf/perf_video.cpp b/modules/cudacodec/perf/perf_video.cpp
similarity index 100%
rename from modules/gpucodec/perf/perf_video.cpp
rename to modules/cudacodec/perf/perf_video.cpp
diff --git a/modules/gpucodec/src/cuda/nv12_to_rgb.cu b/modules/cudacodec/src/cuda/nv12_to_rgb.cu
similarity index 100%
rename from modules/gpucodec/src/cuda/nv12_to_rgb.cu
rename to modules/cudacodec/src/cuda/nv12_to_rgb.cu
diff --git a/modules/gpucodec/src/cuda/rgb_to_yv12.cu b/modules/cudacodec/src/cuda/rgb_to_yv12.cu
similarity index 100%
rename from modules/gpucodec/src/cuda/rgb_to_yv12.cu
rename to modules/cudacodec/src/cuda/rgb_to_yv12.cu
diff --git a/modules/gpucodec/src/cuvid_video_source.cpp b/modules/cudacodec/src/cuvid_video_source.cpp
similarity index 100%
rename from modules/gpucodec/src/cuvid_video_source.cpp
rename to modules/cudacodec/src/cuvid_video_source.cpp
diff --git a/modules/gpucodec/src/cuvid_video_source.hpp b/modules/cudacodec/src/cuvid_video_source.hpp
similarity index 99%
rename from modules/gpucodec/src/cuvid_video_source.hpp
rename to modules/cudacodec/src/cuvid_video_source.hpp
index ba2f3de446..e2f3a6c024 100644
--- a/modules/gpucodec/src/cuvid_video_source.hpp
+++ b/modules/cudacodec/src/cuvid_video_source.hpp
@@ -47,7 +47,7 @@
 #include <nvcuvid.h>
 
 #include "opencv2/core/private.cuda.hpp"
-#include "opencv2/gpucodec.hpp"
+#include "opencv2/cudacodec.hpp"
 #include "video_source.hpp"
 
 namespace cv { namespace cudacodec { namespace detail
diff --git a/modules/gpucodec/src/ffmpeg_video_source.cpp b/modules/cudacodec/src/ffmpeg_video_source.cpp
similarity index 100%
rename from modules/gpucodec/src/ffmpeg_video_source.cpp
rename to modules/cudacodec/src/ffmpeg_video_source.cpp
diff --git a/modules/gpucodec/src/ffmpeg_video_source.hpp b/modules/cudacodec/src/ffmpeg_video_source.hpp
similarity index 98%
rename from modules/gpucodec/src/ffmpeg_video_source.hpp
rename to modules/cudacodec/src/ffmpeg_video_source.hpp
index 46333bc413..aa58321ebf 100644
--- a/modules/gpucodec/src/ffmpeg_video_source.hpp
+++ b/modules/cudacodec/src/ffmpeg_video_source.hpp
@@ -44,7 +44,7 @@
 #ifndef __FFMPEG_VIDEO_SOURCE_HPP__
 #define __FFMPEG_VIDEO_SOURCE_HPP__
 
-#include "opencv2/gpucodec.hpp"
+#include "opencv2/cudacodec.hpp"
 
 struct InputMediaStream_FFMPEG;
 
diff --git a/modules/gpucodec/src/frame_queue.cpp b/modules/cudacodec/src/frame_queue.cpp
similarity index 100%
rename from modules/gpucodec/src/frame_queue.cpp
rename to modules/cudacodec/src/frame_queue.cpp
diff --git a/modules/gpucodec/src/frame_queue.hpp b/modules/cudacodec/src/frame_queue.hpp
similarity index 100%
rename from modules/gpucodec/src/frame_queue.hpp
rename to modules/cudacodec/src/frame_queue.hpp
diff --git a/modules/gpucodec/src/precomp.cpp b/modules/cudacodec/src/precomp.cpp
similarity index 100%
rename from modules/gpucodec/src/precomp.cpp
rename to modules/cudacodec/src/precomp.cpp
diff --git a/modules/gpucodec/src/precomp.hpp b/modules/cudacodec/src/precomp.hpp
similarity index 98%
rename from modules/gpucodec/src/precomp.hpp
rename to modules/cudacodec/src/precomp.hpp
index 694637eb95..80257a0cd6 100644
--- a/modules/gpucodec/src/precomp.hpp
+++ b/modules/cudacodec/src/precomp.hpp
@@ -51,7 +51,7 @@
 #include <stdexcept>
 #include <iostream>
 
-#include "opencv2/gpucodec.hpp"
+#include "opencv2/cudacodec.hpp"
 
 #include "opencv2/core/private.cuda.hpp"
 
diff --git a/modules/gpucodec/src/thread.cpp b/modules/cudacodec/src/thread.cpp
similarity index 100%
rename from modules/gpucodec/src/thread.cpp
rename to modules/cudacodec/src/thread.cpp
diff --git a/modules/gpucodec/src/thread.hpp b/modules/cudacodec/src/thread.hpp
similarity index 100%
rename from modules/gpucodec/src/thread.hpp
rename to modules/cudacodec/src/thread.hpp
diff --git a/modules/gpucodec/src/video_decoder.cpp b/modules/cudacodec/src/video_decoder.cpp
similarity index 100%
rename from modules/gpucodec/src/video_decoder.cpp
rename to modules/cudacodec/src/video_decoder.cpp
diff --git a/modules/gpucodec/src/video_decoder.hpp b/modules/cudacodec/src/video_decoder.hpp
similarity index 99%
rename from modules/gpucodec/src/video_decoder.hpp
rename to modules/cudacodec/src/video_decoder.hpp
index 297b3323ba..5b101b8d21 100644
--- a/modules/gpucodec/src/video_decoder.hpp
+++ b/modules/cudacodec/src/video_decoder.hpp
@@ -47,7 +47,7 @@
 #include <nvcuvid.h>
 
 #include "opencv2/core/private.cuda.hpp"
-#include "opencv2/gpucodec.hpp"
+#include "opencv2/cudacodec.hpp"
 
 namespace cv { namespace cudacodec { namespace detail
 {
diff --git a/modules/gpucodec/src/video_parser.cpp b/modules/cudacodec/src/video_parser.cpp
similarity index 100%
rename from modules/gpucodec/src/video_parser.cpp
rename to modules/cudacodec/src/video_parser.cpp
diff --git a/modules/gpucodec/src/video_parser.hpp b/modules/cudacodec/src/video_parser.hpp
similarity index 99%
rename from modules/gpucodec/src/video_parser.hpp
rename to modules/cudacodec/src/video_parser.hpp
index 5615cc962c..8629610b07 100644
--- a/modules/gpucodec/src/video_parser.hpp
+++ b/modules/cudacodec/src/video_parser.hpp
@@ -47,7 +47,7 @@
 #include <nvcuvid.h>
 
 #include "opencv2/core/private.cuda.hpp"
-#include "opencv2/gpucodec.hpp"
+#include "opencv2/cudacodec.hpp"
 #include "frame_queue.hpp"
 #include "video_decoder.hpp"
 
diff --git a/modules/gpucodec/src/video_reader.cpp b/modules/cudacodec/src/video_reader.cpp
similarity index 100%
rename from modules/gpucodec/src/video_reader.cpp
rename to modules/cudacodec/src/video_reader.cpp
diff --git a/modules/gpucodec/src/video_source.cpp b/modules/cudacodec/src/video_source.cpp
similarity index 100%
rename from modules/gpucodec/src/video_source.cpp
rename to modules/cudacodec/src/video_source.cpp
diff --git a/modules/gpucodec/src/video_source.hpp b/modules/cudacodec/src/video_source.hpp
similarity index 95%
rename from modules/gpucodec/src/video_source.hpp
rename to modules/cudacodec/src/video_source.hpp
index e56c812429..99fd4dbc6f 100644
--- a/modules/gpucodec/src/video_source.hpp
+++ b/modules/cudacodec/src/video_source.hpp
@@ -41,11 +41,11 @@
 //
 //M*/
 
-#ifndef __GPUCODEC_VIDEO_SOURCE_H__
-#define __GPUCODEC_VIDEO_SOURCE_H__
+#ifndef __CUDACODEC_VIDEO_SOURCE_H__
+#define __CUDACODEC_VIDEO_SOURCE_H__
 
 #include "opencv2/core/private.cuda.hpp"
-#include "opencv2/gpucodec.hpp"
+#include "opencv2/cudacodec.hpp"
 #include "thread.hpp"
 
 namespace cv { namespace cudacodec { namespace detail
@@ -96,4 +96,4 @@ private:
 
 }}}
 
-#endif // __GPUCODEC_VIDEO_SOURCE_H__
+#endif // __CUDACODEC_VIDEO_SOURCE_H__
diff --git a/modules/gpucodec/src/video_writer.cpp b/modules/cudacodec/src/video_writer.cpp
similarity index 100%
rename from modules/gpucodec/src/video_writer.cpp
rename to modules/cudacodec/src/video_writer.cpp
diff --git a/modules/gpucodec/test/test_main.cpp b/modules/cudacodec/test/test_main.cpp
similarity index 100%
rename from modules/gpucodec/test/test_main.cpp
rename to modules/cudacodec/test/test_main.cpp
diff --git a/modules/gpucodec/test/test_precomp.cpp b/modules/cudacodec/test/test_precomp.cpp
similarity index 100%
rename from modules/gpucodec/test/test_precomp.cpp
rename to modules/cudacodec/test/test_precomp.cpp
diff --git a/modules/gpucodec/test/test_precomp.hpp b/modules/cudacodec/test/test_precomp.hpp
similarity index 98%
rename from modules/gpucodec/test/test_precomp.hpp
rename to modules/cudacodec/test/test_precomp.hpp
index 95e70d46df..38d3bef548 100644
--- a/modules/gpucodec/test/test_precomp.hpp
+++ b/modules/cudacodec/test/test_precomp.hpp
@@ -54,7 +54,7 @@
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/gpu_test.hpp"
 
-#include "opencv2/gpucodec.hpp"
+#include "opencv2/cudacodec.hpp"
 #include "opencv2/highgui.hpp"
 
 #include "cvconfig.h"
diff --git a/modules/gpucodec/test/test_video.cpp b/modules/cudacodec/test/test_video.cpp
similarity index 100%
rename from modules/gpucodec/test/test_video.cpp
rename to modules/cudacodec/test/test_video.cpp
diff --git a/modules/superres/CMakeLists.txt b/modules/superres/CMakeLists.txt
index 45150617c6..a7d406d458 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_gpuarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc opencv_gpuoptflow opencv_gpucodec)
+                  opencv_gpuarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc opencv_gpuoptflow opencv_cudacodec)
diff --git a/modules/superres/src/frame_source.cpp b/modules/superres/src/frame_source.cpp
index f20f6182e2..eddc73774a 100644
--- a/modules/superres/src/frame_source.cpp
+++ b/modules/superres/src/frame_source.cpp
@@ -199,7 +199,7 @@ Ptr<FrameSource> cv::superres::createFrameSource_Camera(int deviceId)
 //////////////////////////////////////////////////////
 // VideoFrameSource_GPU
 
-#ifndef HAVE_OPENCV_GPUCODEC
+#ifndef HAVE_OPENCV_CUDACODEC
 
 Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const String& fileName)
 {
@@ -208,7 +208,7 @@ Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const String& fileNam
     return Ptr<FrameSource>();
 }
 
-#else // HAVE_OPENCV_GPUCODEC
+#else // HAVE_OPENCV_CUDACODEC
 
 namespace
 {
@@ -260,4 +260,4 @@ Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const String& fileNam
     return new VideoFrameSource(fileName);
 }
 
-#endif // HAVE_OPENCV_GPUCODEC
+#endif // HAVE_OPENCV_CUDACODEC
diff --git a/modules/superres/src/precomp.hpp b/modules/superres/src/precomp.hpp
index 89490c70ca..7e8d581171 100644
--- a/modules/superres/src/precomp.hpp
+++ b/modules/superres/src/precomp.hpp
@@ -77,8 +77,8 @@
 #  include "opencv2/gpuoptflow.hpp"
 #endif
 
-#ifdef HAVE_OPENCV_GPUCODEC
-#  include "opencv2/gpucodec.hpp"
+#ifdef HAVE_OPENCV_CUDACODEC
+#  include "opencv2/cudacodec.hpp"
 #endif
 
 #ifdef HAVE_OPENCV_OCL
diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt
index b953627b1b..a532d44f67 100644
--- a/samples/gpu/CMakeLists.txt
+++ b/samples/gpu/CMakeLists.txt
@@ -23,8 +23,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
     ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/nonfree/include")
   endif()
 
-  if(HAVE_opencv_gpucodec)
-    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpucodec/include")
+  if(HAVE_opencv_cudacodec)
+    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/cudacodec/include")
   endif()
 
   if(HAVE_CUDA)
@@ -55,8 +55,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
     if(HAVE_opencv_nonfree)
       target_link_libraries(${the_target} opencv_nonfree)
     endif()
-    if(HAVE_opencv_gpucodec)
-      target_link_libraries(${the_target} opencv_gpucodec)
+    if(HAVE_opencv_cudacodec)
+      target_link_libraries(${the_target} opencv_cudacodec)
     endif()
 
     if(HAVE_OPENCL)
diff --git a/samples/gpu/video_reader.cpp b/samples/gpu/video_reader.cpp
index 8d088f919a..e9326047f2 100644
--- a/samples/gpu/video_reader.cpp
+++ b/samples/gpu/video_reader.cpp
@@ -2,7 +2,7 @@
 
 #include "opencv2/opencv_modules.hpp"
 
-#if defined(HAVE_OPENCV_GPUCODEC)
+#if defined(HAVE_OPENCV_CUDACODEC)
 
 #include <string>
 #include <vector>
@@ -11,7 +11,7 @@
 
 #include <opencv2/core.hpp>
 #include <opencv2/core/opengl.hpp>
-#include <opencv2/gpucodec.hpp>
+#include <opencv2/cudacodec.hpp>
 #include <opencv2/highgui.hpp>
 #include <opencv2/contrib.hpp>
 
diff --git a/samples/gpu/video_writer.cpp b/samples/gpu/video_writer.cpp
index 470e7e5518..1d6a1964bc 100644
--- a/samples/gpu/video_writer.cpp
+++ b/samples/gpu/video_writer.cpp
@@ -2,13 +2,13 @@
 
 #include "opencv2/opencv_modules.hpp"
 
-#if defined(HAVE_OPENCV_GPUCODEC) && defined(WIN32)
+#if defined(HAVE_OPENCV_CUDACODEC) && defined(WIN32)
 
 #include <vector>
 #include <numeric>
 
 #include "opencv2/core.hpp"
-#include "opencv2/gpucodec.hpp"
+#include "opencv2/cudacodec.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/contrib.hpp"