diff --git a/include/fmt/core.h b/include/fmt/core.h
index 36816d46..4b067c6b 100644
--- a/include/fmt/core.h
+++ b/include/fmt/core.h
@@ -918,6 +918,10 @@ class basic_parse_context : private ErrorHandler {
   FMT_CONSTEXPR ErrorHandler error_handler() const { return *this; }
 };
 
+typedef basic_parse_context<char> format_parse_context;
+typedef basic_parse_context<wchar_t> wformat_parse_context;
+
+// DEPRECATED!
 typedef basic_parse_context<char> parse_context;
 typedef basic_parse_context<wchar_t> wparse_context;
 
diff --git a/test/core-test.cc b/test/core-test.cc
index d8a6500c..fe7583ba 100644
--- a/test/core-test.cc
+++ b/test/core-test.cc
@@ -228,7 +228,9 @@ struct custom_context {
 
   bool called;
 
-  fmt::parse_context parse_context() { return fmt::parse_context(""); }
+  fmt::format_parse_context parse_context() {
+    return fmt::format_parse_context("");
+  }
   void advance_to(const char *) {}
 };
 
diff --git a/test/locale-test.cc b/test/locale-test.cc
index 6c8dd0ae..83b0f316 100644
--- a/test/locale-test.cc
+++ b/test/locale-test.cc
@@ -1,4 +1,4 @@
-// Formatting library for C++ - core tests
+// Formatting library for C++ - locale tests
 //
 // Copyright (c) 2012 - present, Victor Zverovich
 // All rights reserved.