diff --git a/programs/.gitignore b/programs/.gitignore
index 2fd5b21eb..b2685a9e0 100644
--- a/programs/.gitignore
+++ b/programs/.gitignore
@@ -40,12 +40,12 @@ ssl/dtls_client
 ssl/dtls_server
 ssl/ssl_client1
 ssl/ssl_client2
+ssl/ssl_context_info
 ssl/ssl_fork_server
 ssl/ssl_mail_client
 ssl/ssl_pthread_server
 ssl/ssl_server
 ssl/ssl_server2
-ssl/ssl_base64_dump
 ssl/mini_client
 test/benchmark
 test/ecp-bench
diff --git a/programs/Makefile b/programs/Makefile
index 9ae8f459b..68bcfc2e1 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -84,7 +84,7 @@ APPS = \
 	ssl/ssl_client2$(EXEXT) \
 	ssl/ssl_server$(EXEXT) \
 	ssl/ssl_server2$(EXEXT) \
-	ssl/ssl_base64_dump$(EXEXT) \
+	ssl/ssl_context_info$(EXEXT) \
 	ssl/ssl_fork_server$(EXEXT) \
 	ssl/mini_client$(EXEXT) \
 	ssl/ssl_mail_client$(EXEXT) \
@@ -283,9 +283,9 @@ ssl/ssl_server2$(EXEXT): ssl/ssl_server2.c test/query_config.c $(DEP)
 	echo "  CC    ssl/ssl_server2.c"
 	$(CC) $(LOCAL_CFLAGS) $(CFLAGS) ssl/ssl_server2.c test/query_config.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
 
-ssl/ssl_base64_dump$(EXEXT): ssl/ssl_base64_dump.c test/query_config.c $(DEP)
-	echo "  CC    ssl/ssl_base64_dump.c"
-	$(CC) $(LOCAL_CFLAGS) $(CFLAGS) ssl/ssl_base64_dump.c test/query_config.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
+ssl/ssl_context_info$(EXEXT): ssl/ssl_context_info.c test/query_config.c $(DEP)
+	echo "  CC    ssl/ssl_context_info.c"
+	$(CC) $(LOCAL_CFLAGS) $(CFLAGS) ssl/ssl_context_info.c test/query_config.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
 
 ssl/ssl_fork_server$(EXEXT): ssl/ssl_fork_server.c $(DEP)
 	echo "  CC    ssl/ssl_fork_server.c"
diff --git a/programs/ssl/CMakeLists.txt b/programs/ssl/CMakeLists.txt
index 0e6c6324b..481e2b0ee 100644
--- a/programs/ssl/CMakeLists.txt
+++ b/programs/ssl/CMakeLists.txt
@@ -44,8 +44,8 @@ add_executable(ssl_server2 ssl_server2.c)
 target_sources(ssl_server2 PUBLIC ../test/query_config.c)
 target_link_libraries(ssl_server2 ${libs})
 
-add_executable(ssl_base64_dump ssl_base64_dump.c)
-target_link_libraries(ssl_base64_dump ${libs})
+add_executable(ssl_context_info ssl_context_info.c)
+target_link_libraries(ssl_context_info ${libs})
 
 add_executable(ssl_fork_server ssl_fork_server.c)
 target_link_libraries(ssl_fork_server ${libs})
diff --git a/programs/ssl/ssl_base64_dump.c b/programs/ssl/ssl_context_info.c
similarity index 99%
rename from programs/ssl/ssl_base64_dump.c
rename to programs/ssl/ssl_context_info.c
index 3a8b44cb5..f35f73502 100644
--- a/programs/ssl/ssl_base64_dump.c
+++ b/programs/ssl/ssl_context_info.c
@@ -40,7 +40,7 @@
 /*
  * This program version
  */
-#define PROG_NAME "ssl_base64_dump"
+#define PROG_NAME "ssl_context_info"
 #define VER_MAJOR 0
 #define VER_MINOR 1
 
diff --git a/visualc/VS2010/mbedTLS.sln b/visualc/VS2010/mbedTLS.sln
index 2b0c519c6..6969bbb21 100644
--- a/visualc/VS2010/mbedTLS.sln
+++ b/visualc/VS2010/mbedTLS.sln
@@ -168,7 +168,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssl_server2", "ssl_server2.
 		{46CF2D25-6A36-4189-B59C-E4815388E554} = {46CF2D25-6A36-4189-B59C-E4815388E554}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssl_base64_dump", "ssl_base64_dump.vcxproj", "{5B8122A8-D506-B642-BAA1-6030EEBA7446}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssl_context_info", "ssl_context_info.vcxproj", "{017ECC7D-FB6D-46D8-076B-F64172E8E3BC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{46CF2D25-6A36-4189-B59C-E4815388E554} = {46CF2D25-6A36-4189-B59C-E4815388E554}
 	EndProjectSection
@@ -543,14 +543,14 @@ Global
 		{A4DA7463-1047-BDF5-E1B3-5632CB573F41}.Release|Win32.Build.0 = Release|Win32
 		{A4DA7463-1047-BDF5-E1B3-5632CB573F41}.Release|x64.ActiveCfg = Release|x64
 		{A4DA7463-1047-BDF5-E1B3-5632CB573F41}.Release|x64.Build.0 = Release|x64
-		{5B8122A8-D506-B642-BAA1-6030EEBA7446}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5B8122A8-D506-B642-BAA1-6030EEBA7446}.Debug|Win32.Build.0 = Debug|Win32
-		{5B8122A8-D506-B642-BAA1-6030EEBA7446}.Debug|x64.ActiveCfg = Debug|x64
-		{5B8122A8-D506-B642-BAA1-6030EEBA7446}.Debug|x64.Build.0 = Debug|x64
-		{5B8122A8-D506-B642-BAA1-6030EEBA7446}.Release|Win32.ActiveCfg = Release|Win32
-		{5B8122A8-D506-B642-BAA1-6030EEBA7446}.Release|Win32.Build.0 = Release|Win32
-		{5B8122A8-D506-B642-BAA1-6030EEBA7446}.Release|x64.ActiveCfg = Release|x64
-		{5B8122A8-D506-B642-BAA1-6030EEBA7446}.Release|x64.Build.0 = Release|x64
+		{017ECC7D-FB6D-46D8-076B-F64172E8E3BC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{017ECC7D-FB6D-46D8-076B-F64172E8E3BC}.Debug|Win32.Build.0 = Debug|Win32
+		{017ECC7D-FB6D-46D8-076B-F64172E8E3BC}.Debug|x64.ActiveCfg = Debug|x64
+		{017ECC7D-FB6D-46D8-076B-F64172E8E3BC}.Debug|x64.Build.0 = Debug|x64
+		{017ECC7D-FB6D-46D8-076B-F64172E8E3BC}.Release|Win32.ActiveCfg = Release|Win32
+		{017ECC7D-FB6D-46D8-076B-F64172E8E3BC}.Release|Win32.Build.0 = Release|Win32
+		{017ECC7D-FB6D-46D8-076B-F64172E8E3BC}.Release|x64.ActiveCfg = Release|x64
+		{017ECC7D-FB6D-46D8-076B-F64172E8E3BC}.Release|x64.Build.0 = Release|x64
 		{918CD402-047D-8467-E11C-E1132053F916}.Debug|Win32.ActiveCfg = Debug|Win32
 		{918CD402-047D-8467-E11C-E1132053F916}.Debug|Win32.Build.0 = Debug|Win32
 		{918CD402-047D-8467-E11C-E1132053F916}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/visualc/VS2010/ssl_base64_dump.vcxproj b/visualc/VS2010/ssl_context_info.vcxproj
similarity index 96%
rename from visualc/VS2010/ssl_base64_dump.vcxproj
rename to visualc/VS2010/ssl_context_info.vcxproj
index 2b088e178..f25229874 100644
--- a/visualc/VS2010/ssl_base64_dump.vcxproj
+++ b/visualc/VS2010/ssl_context_info.vcxproj
@@ -19,7 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\programs\ssl\ssl_base64_dump.c" />
+    <ClCompile Include="..\..\programs\ssl\ssl_context_info.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="mbedTLS.vcxproj">
@@ -28,9 +28,9 @@
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{5B8122A8-D506-B642-BAA1-6030EEBA7446}</ProjectGuid>
+    <ProjectGuid>{017ECC7D-FB6D-46D8-076B-F64172E8E3BC}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>ssl_base64_dump</RootNamespace>
+    <RootNamespace>ssl_context_info</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">