diff --git a/modules/highgui/doc/user_interface.rst b/modules/highgui/doc/user_interface.rst
index 0ffd69ac5..7573a1f7c 100644
--- a/modules/highgui/doc/user_interface.rst
+++ b/modules/highgui/doc/user_interface.rst
@@ -79,7 +79,7 @@ The function ``imshow`` displays an image in the specified window. If the window
 
     * If the image is 32-bit floating-point, the pixel values are multiplied by 255. That is, the value range [0,1] is mapped to [0,255].
 
-If window was created with OpenGL support, ``imshow`` also support :ocv:class:`ogl::Buffer` ,  :ocv:class:`ogl::Texture2D` and  :ocv:class:`gpu::GpuMat` as input.
+If window was created with OpenGL support, ``imshow`` also support :ocv:class:`ogl::Buffer` ,  :ocv:class:`ogl::Texture2D` and  :ocv:class:`cuda::GpuMat` as input.
 
 .. note:: This function should be followed by ``waitKey`` function which displays the image for specified milliseconds. Otherwise, it won't display the image.
 
diff --git a/modules/java/generator/rst_parser.py b/modules/java/generator/rst_parser.py
index 86625f396..63f56dbaa 100755
--- a/modules/java/generator/rst_parser.py
+++ b/modules/java/generator/rst_parser.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import os, sys, re, string, fnmatch
-allmodules = ["core", "flann", "imgproc", "ml", "highgui", "video", "features2d", "calib3d", "objdetect", "legacy", "contrib", "gpu", "androidcamera", "java", "python", "stitching", "ts", "photo", "nonfree", "videostab", "ocl", "softcascade", "superres"]
+allmodules = ["core", "flann", "imgproc", "ml", "highgui", "video", "features2d", "calib3d", "objdetect", "legacy", "contrib", "cuda", "androidcamera", "java", "python", "stitching", "ts", "photo", "nonfree", "videostab", "ocl", "softcascade", "superres"]
 verbose = False
 show_warnings = True
 show_errors = True
diff --git a/modules/softcascade/doc/softcascade_cuda.rst b/modules/softcascade/doc/softcascade_cuda.rst
index 92b3bf6be..32abb8c05 100644
--- a/modules/softcascade/doc/softcascade_cuda.rst
+++ b/modules/softcascade/doc/softcascade_cuda.rst
@@ -51,7 +51,7 @@ softcascade::SCascade::detect
 ------------------------------
 Apply cascade to an input frame and return the vector of Decection objcts.
 
-.. ocv:function:: void softcascade::SCascade::detect(InputArray image, InputArray rois, OutputArray objects, cv::gpu::Stream& stream = cv::gpu::Stream::Null()) const
+.. ocv:function:: void softcascade::SCascade::detect(InputArray image, InputArray rois, OutputArray objects, cv::cuda::Stream& stream = cv::cuda::Stream::Null()) const
 
     :param image: a frame on which detector will be applied.
 
diff --git a/modules/superres/doc/super_resolution.rst b/modules/superres/doc/super_resolution.rst
index 1772b0d2d..c6475985e 100644
--- a/modules/superres/doc/super_resolution.rst
+++ b/modules/superres/doc/super_resolution.rst
@@ -51,7 +51,7 @@ Create Bilateral TV-L1 Super Resolution.
 
 .. ocv:function:: Ptr<SuperResolution> superres::createSuperResolution_BTVL1()
 
-.. ocv:function:: Ptr<SuperResolution> superres::createSuperResolution_BTVL1_GPU()
+.. ocv:function:: Ptr<SuperResolution> superres::createSuperResolution_BTVL1_CUDA()
 
 This class implements Super Resolution algorithm described in the papers [Farsiu03]_ and [Mitzel09]_ .
 
diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt
index bd573a78f..7aaaf6fb5 100644
--- a/samples/gpu/CMakeLists.txt
+++ b/samples/gpu/CMakeLists.txt
@@ -97,4 +97,3 @@ if (INSTALL_C_EXAMPLES AND NOT WIN32)
           DESTINATION share/OpenCV/samples/${project}
           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
 endif()
-