diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 7a7d1d655..c9073c2ab 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -1018,13 +1018,13 @@ size_t RTLIL::Module::count_id(const RTLIL::IdString& id)
 
 #ifndef NDEBUG
 namespace {
-	struct InternalOldCellChecker
+	struct InternalCellChecker
 	{
 		RTLIL::Module *module;
 		RTLIL::Cell *cell;
 		pool<RTLIL::IdString> expected_params, expected_ports;
 
-		InternalOldCellChecker(RTLIL::Module *module, RTLIL::Cell *cell) : module(module), cell(cell) { }
+		InternalCellChecker(RTLIL::Module *module, RTLIL::Cell *cell) : module(module), cell(cell) { }
 
 		void error(int linenr)
 		{
@@ -1983,7 +1983,7 @@ void RTLIL::Module::check()
 		// 	log_assert(!it2.first.empty());
 		for (auto it2 : it.second->parameters)
 			log_assert(!it2.first.empty());
-		InternalOldCellChecker checker(this, it.second);
+		InternalCellChecker checker(this, it.second);
 		checker.check();
 		if (it.second->has_memid()) {
 			log_assert(memories.count(it.second->parameters.at(ID::MEMID).decode_string()));
@@ -3915,7 +3915,7 @@ void RTLIL::OldCell::sort()
 void RTLIL::Cell::check()
 {
 #ifndef NDEBUG
-	InternalOldCellChecker checker(NULL, this);
+	InternalCellChecker checker(NULL, this);
 	checker.check();
 #endif
 }
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index cc9bed4fa..7498b315e 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1708,7 +1708,7 @@ public:
 		void reserve(int n) { (void)n; }
 		// Watch out! This is different semantics than what dict has!
 		// but we rely on RTLIL::Cell always being constructed correctly
-		// since its layout is fixed as defined by InternalOldCellChecker
+		// since its layout is fixed as defined by InternalCellChecker
 		RTLIL::Const& operator[](RTLIL::IdString name) {
 			// log("operator[] on %s type %s\n", name.c_str(), parent->type.c_str());
 			return parent->getMutParam(name);
@@ -1975,7 +1975,7 @@ public:
 		void reserve(int n) { (void)n; }
 		// Watch out! This is different semantics than what dict has!
 		// but we rely on RTLIL::Cell always being constructed correctly
-		// since its layout is fixed as defined by InternalOldCellChecker
+		// since its layout is fixed as defined by InternalCellChecker
 		RTLIL::SigSpec& operator[](RTLIL::IdString portname) {
 			// log("operator[] on %s type %s\n", portname.c_str(), parent->type.c_str());
 			return parent->getMutPort(portname);