diff --git a/modules/matlab/CMakeLists.txt b/modules/matlab/CMakeLists.txt
index 45e3197c4..9f08e5517 100644
--- a/modules/matlab/CMakeLists.txt
+++ b/modules/matlab/CMakeLists.txt
@@ -91,7 +91,7 @@ ocv_add_module(matlab   BINDINGS
                                  opencv_photo opencv_video opencv_videostab
                                  opencv_calib opencv_calib3d
                                  opencv_stitching opencv_superres
-                                 opencv_nonfree
+                                 opencv_xfeatures2d
 )
 
 # get the commit information
diff --git a/modules/reg/samples/map_test.cpp b/modules/reg/samples/map_test.cpp
index 4ce4d4fe3..221125187 100644
--- a/modules/reg/samples/map_test.cpp
+++ b/modules/reg/samples/map_test.cpp
@@ -47,7 +47,7 @@
 #include <opencv2/highgui/highgui_c.h>
 
 #ifdef COMPARE_FEATURES
-#include <opencv2/nonfree.hpp>
+#include <opencv2/xfeatures2d/nonfree.hpp>
 #include <opencv2/calib3d.hpp>
 #include <opencv2/calib3d/calib3d_c.h>
 #endif
diff --git a/modules/xfeatures2d/doc/nonfree_features.rst b/modules/xfeatures2d/doc/nonfree_features.rst
index ce61280f8..0ad058c0f 100644
--- a/modules/xfeatures2d/doc/nonfree_features.rst
+++ b/modules/xfeatures2d/doc/nonfree_features.rst
@@ -143,7 +143,7 @@ Detects keypoints and computes SURF descriptors for them.
 
 The function is parallelized with the TBB library.
 
-If you are using the C version, make sure you call ``cv::initModule_nonfree()`` from ``nonfree/nonfree.hpp``.
+If you are using the C version, make sure you call ``cv::initModule_xfeatures2d()`` from ``xfeatures2d/nonfree.hpp``.
 
 
 cuda::SURF_CUDA
diff --git a/modules/xfeatures2d/include/opencv2/xfeatures2d/cuda.hpp b/modules/xfeatures2d/include/opencv2/xfeatures2d/cuda.hpp
index 0e1f8e551..b05804d83 100644
--- a/modules/xfeatures2d/include/opencv2/xfeatures2d/cuda.hpp
+++ b/modules/xfeatures2d/include/opencv2/xfeatures2d/cuda.hpp
@@ -40,8 +40,8 @@
 //
 //M*/
 
-#ifndef __OPENCV_NONFREE_CUDA_HPP__
-#define __OPENCV_NONFREE_CUDA_HPP__
+#ifndef __OPENCV_XFEATURES2D_CUDA_HPP__
+#define __OPENCV_XFEATURES2D_CUDA_HPP__
 
 #include "opencv2/core/cuda.hpp"
 
@@ -125,4 +125,4 @@ public:
 
 }} // namespace cv { namespace cuda {
 
-#endif // __OPENCV_NONFREE_CUDA_HPP__
+#endif // __OPENCV_XFEATURES2D_CUDA_HPP__
diff --git a/modules/xfeatures2d/include/opencv2/xfeatures2d/nonfree.hpp b/modules/xfeatures2d/include/opencv2/xfeatures2d/nonfree.hpp
index 42e6eedf4..eaa60bc2b 100644
--- a/modules/xfeatures2d/include/opencv2/xfeatures2d/nonfree.hpp
+++ b/modules/xfeatures2d/include/opencv2/xfeatures2d/nonfree.hpp
@@ -40,8 +40,8 @@
 //
 //M*/
 
-#ifndef __OPENCV_NONFREE_FEATURES_2D_HPP__
-#define __OPENCV_NONFREE_FEATURES_2D_HPP__
+#ifndef __OPENCV_XFEATURES2D_FEATURES_2D_HPP__
+#define __OPENCV_XFEATURES2D_FEATURES_2D_HPP__
 
 #include "opencv2/features2d.hpp"
 
diff --git a/modules/xfeatures2d/perf/perf_main.cpp b/modules/xfeatures2d/perf/perf_main.cpp
index a5a76af55..14096ba0c 100644
--- a/modules/xfeatures2d/perf/perf_main.cpp
+++ b/modules/xfeatures2d/perf/perf_main.cpp
@@ -8,4 +8,4 @@ static const char * impls[] = {
     "plain"
 };
 
-CV_PERF_TEST_MAIN_WITH_IMPLS(nonfree, impls, perf::printCudaInfo())
+CV_PERF_TEST_MAIN_WITH_IMPLS(xfeatures2d, impls, perf::printCudaInfo())
diff --git a/modules/xfeatures2d/src/precomp.hpp b/modules/xfeatures2d/src/precomp.hpp
index ddecdbe90..5aa3591ef 100644
--- a/modules/xfeatures2d/src/precomp.hpp
+++ b/modules/xfeatures2d/src/precomp.hpp
@@ -52,7 +52,7 @@
 #include "opencv2/core/private.hpp"
 #include "opencv2/core/private.cuda.hpp"
 
-//#include "opencv2/nonfree/cuda.hpp"
+//#include "opencv2/xfeatures2d/cuda.hpp"
 //#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/core/ocl.hpp"
diff --git a/modules/xfeatures2d/src/surf.hpp b/modules/xfeatures2d/src/surf.hpp
index 96786eecd..9438ac66c 100644
--- a/modules/xfeatures2d/src/surf.hpp
+++ b/modules/xfeatures2d/src/surf.hpp
@@ -1,7 +1,7 @@
 ///////////// see LICENSE.txt in the OpenCV root directory //////////////
 
-#ifndef __OPENCV_NONFREE_SURF_HPP__
-#define __OPENCV_NONFREE_SURF_HPP__
+#ifndef __OPENCV_XFEATURES2D_SURF_HPP__
+#define __OPENCV_XFEATURES2D_SURF_HPP__
 
 namespace cv
 {