diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorContractionCuda.h b/unsupported/Eigen/CXX11/src/Tensor/TensorContractionGpu.h
similarity index 100%
rename from unsupported/Eigen/CXX11/src/Tensor/TensorContractionCuda.h
rename to unsupported/Eigen/CXX11/src/Tensor/TensorContractionGpu.h
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceGpu.h
similarity index 100%
rename from unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h
rename to unsupported/Eigen/CXX11/src/Tensor/TensorDeviceGpu.h
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorReductionCuda.h b/unsupported/Eigen/CXX11/src/Tensor/TensorReductionGpu.h
similarity index 100%
rename from unsupported/Eigen/CXX11/src/Tensor/TensorReductionCuda.h
rename to unsupported/Eigen/CXX11/src/Tensor/TensorReductionGpu.h
diff --git a/unsupported/test/cxx11_tensor_argmax_cuda.cu b/unsupported/test/cxx11_tensor_argmax_gpu.cu
similarity index 100%
rename from unsupported/test/cxx11_tensor_argmax_cuda.cu
rename to unsupported/test/cxx11_tensor_argmax_gpu.cu
diff --git a/unsupported/test/cxx11_tensor_cast_float16_cuda.cu b/unsupported/test/cxx11_tensor_cast_float16_gpu.cu
similarity index 100%
rename from unsupported/test/cxx11_tensor_cast_float16_cuda.cu
rename to unsupported/test/cxx11_tensor_cast_float16_gpu.cu
diff --git a/unsupported/test/cxx11_tensor_complex_cwise_ops_cuda.cu b/unsupported/test/cxx11_tensor_complex_cwise_ops_gpu.cu
similarity index 100%
rename from unsupported/test/cxx11_tensor_complex_cwise_ops_cuda.cu
rename to unsupported/test/cxx11_tensor_complex_cwise_ops_gpu.cu
diff --git a/unsupported/test/cxx11_tensor_complex_cuda.cu b/unsupported/test/cxx11_tensor_complex_gpu.cu
similarity index 100%
rename from unsupported/test/cxx11_tensor_complex_cuda.cu
rename to unsupported/test/cxx11_tensor_complex_gpu.cu
diff --git a/unsupported/test/cxx11_tensor_contract_cuda.cu b/unsupported/test/cxx11_tensor_contract_gpu.cu
similarity index 100%
rename from unsupported/test/cxx11_tensor_contract_cuda.cu
rename to unsupported/test/cxx11_tensor_contract_gpu.cu
diff --git a/unsupported/test/cxx11_tensor_cuda.cu b/unsupported/test/cxx11_tensor_gpu.cu
similarity index 100%
rename from unsupported/test/cxx11_tensor_cuda.cu
rename to unsupported/test/cxx11_tensor_gpu.cu
diff --git a/unsupported/test/cxx11_tensor_of_float16_cuda.cu b/unsupported/test/cxx11_tensor_of_float16_gpu.cu
similarity index 100%
rename from unsupported/test/cxx11_tensor_of_float16_cuda.cu
rename to unsupported/test/cxx11_tensor_of_float16_gpu.cu
diff --git a/unsupported/test/cxx11_tensor_random_cuda.cu b/unsupported/test/cxx11_tensor_random_gpu.cu
similarity index 100%
rename from unsupported/test/cxx11_tensor_random_cuda.cu
rename to unsupported/test/cxx11_tensor_random_gpu.cu
diff --git a/unsupported/test/cxx11_tensor_reduction_cuda.cu b/unsupported/test/cxx11_tensor_reduction_gpu.cu
similarity index 100%
rename from unsupported/test/cxx11_tensor_reduction_cuda.cu
rename to unsupported/test/cxx11_tensor_reduction_gpu.cu
diff --git a/unsupported/test/cxx11_tensor_scan_cuda.cu b/unsupported/test/cxx11_tensor_scan_gpu.cu
similarity index 100%
rename from unsupported/test/cxx11_tensor_scan_cuda.cu
rename to unsupported/test/cxx11_tensor_scan_gpu.cu