diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile
index cd9ca5c86d84..99bfa7e03b47 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile
@@ -1,3 +1,3 @@
 LEVEL = ../../../make
-C_SOURCES := main.c
+CXX_SOURCES := main.cpp
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestTypeLookup.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestCppTypeLookup.py
similarity index 99%
rename from lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestTypeLookup.py
rename to lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestCppTypeLookup.py
index 490c03be97b2..8fb003bb6506 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestTypeLookup.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestCppTypeLookup.py
@@ -10,7 +10,7 @@ import lldbsuite.test.lldbutil as lldbutil
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import decorators
 
-class TestTypeLookup(TestBase):
+class TestCppTypeLookup(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/main.cpp
index db8d412881eb..b244e80962c8 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/main.cpp
@@ -1,4 +1,4 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
+//===-- main.cpp ------------------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //