diff --git a/test/foptiattr-test.cpp b/test/foptiattr-test.cpp
index 98015217..e59dbf1f 100644
--- a/test/foptiattr-test.cpp
+++ b/test/foptiattr-test.cpp
@@ -934,7 +934,7 @@ void FOptiAttrTest::vt100Test()
   CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
                          , C_STR(CSI "0m\017$<2>") );
   CPPUNIT_ASSERT ( *from == *to );
-  CPPUNIT_ASSERT ( to->encoded_code == ' ' );
+  CPPUNIT_ASSERT ( to->encoded_char == ' ' );
   CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
 
   // Invisible off (with default colors)
@@ -1882,7 +1882,7 @@ void FOptiAttrTest::rxvtTest()
   CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
                          , C_STR(CSI "0m\017") );
   CPPUNIT_ASSERT ( *from == *to );
-  CPPUNIT_ASSERT ( to->encoded_code == ' ' );
+  CPPUNIT_ASSERT ( to->encoded_char == ' ' );
   CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
 
   // Invisible off (with default colors)
@@ -2354,7 +2354,7 @@ void FOptiAttrTest::linuxTest()
   CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
                          , C_STR(CSI "0m\017") );
   CPPUNIT_ASSERT ( *from == *to );
-  CPPUNIT_ASSERT ( to->encoded_code == ' ' );
+  CPPUNIT_ASSERT ( to->encoded_char == ' ' );
   CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
 
   // Invisible off (with default colors)
@@ -2838,7 +2838,7 @@ void FOptiAttrTest::puttyTest()
   CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
                          , C_STR(CSI "0m\017") );
   CPPUNIT_ASSERT ( *from == *to );
-  CPPUNIT_ASSERT ( to->encoded_code == ' ' );
+  CPPUNIT_ASSERT ( to->encoded_char == ' ' );
   CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
 
   // Invisible off (with default colors)
@@ -3312,7 +3312,7 @@ void FOptiAttrTest::teratermTest()
   CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
                          , C_STR(CSI "0m\017$<2>") );
   CPPUNIT_ASSERT ( *from == *to );
-  CPPUNIT_ASSERT ( to->encoded_code == ' ' );
+  CPPUNIT_ASSERT ( to->encoded_char == ' ' );
   CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
 
   // Invisible off (with default colors)
@@ -3770,7 +3770,7 @@ void FOptiAttrTest::ibmColorTest()
   CPPUNIT_ASSERT ( *from != *to );
   CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR("") );
   CPPUNIT_ASSERT ( *from == *to );
-  CPPUNIT_ASSERT ( to->encoded_code == ' ' );
+  CPPUNIT_ASSERT ( to->encoded_char == ' ' );
   CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
 
   // Invisible off (with default colors)