diff --git a/samples/Editioning.py b/samples/Editioning.py
index f87ec3c..86d9564 100644
--- a/samples/Editioning.py
+++ b/samples/Editioning.py
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# Copyright 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 # Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
 #
@@ -9,10 +9,10 @@
 
 #------------------------------------------------------------------------------
 # Editioning.py
-#   This script demonstrates the use of editioning, available in Oracle
-# Database 11.2 and higher. See the Oracle documentation on the subject for
-# additional information. Adjust the contants at the top of the script for
-# your own database as needed.
+#   This script demonstrates the use of Edition-Based Redefinition, available
+# in Oracle# Database 11.2 and higher. See the Oracle documentation on the
+# subject for additional information. Adjust the contants at the top of the
+# script for your own database as needed.
 #
 # This script requires cx_Oracle 5.3 and higher.
 #------------------------------------------------------------------------------
@@ -21,51 +21,57 @@ from __future__ import print_function
 
 import cx_Oracle
 import SampleEnv
+import os
 
 # connect to the editions user and create a procedure
 connection = cx_Oracle.Connection(SampleEnv.EDITION_CONNECT_STRING)
-print("Edition should be None at this point, actual value is",
-        connection.edition)
+print("Edition should be None, actual value is:",
+        repr(connection.edition))
 cursor = connection.cursor()
 cursor.execute("""
         create or replace function TestEditions return varchar2 as
         begin
-            return 'Base Edition';
+            return 'Base Procedure';
         end;""")
 result = cursor.callfunc("TestEditions", str)
-print("Function call should return Base Edition, actually returns", result)
+print("Function should return 'Base Procedure', actually returns:",
+        repr(result))
 
 # next, change the edition and recreate the procedure in the new edition
 cursor.execute("alter session set edition = %s" % SampleEnv.EDITION_NAME)
-print("Edition should be %s at this point, actual value is" % \
-        SampleEnv.EDITION_NAME.upper(), connection.edition)
+print("Edition should be", repr(SampleEnv.EDITION_NAME.upper()),
+        "actual value is:", repr(connection.edition))
 cursor.execute("""
         create or replace function TestEditions return varchar2 as
         begin
-            return 'Edition 1';
+            return 'Edition 1 Procedure';
         end;""")
 result = cursor.callfunc("TestEditions", str)
-print("Function call should return Edition 1, actually returns", result)
+print("Function should return 'Edition 1 Procedure', actually returns:",
+        repr(result))
 
 # next, change the edition back to the base edition and demonstrate that the
 # original function is being called
 cursor.execute("alter session set edition = ORA$BASE")
 result = cursor.callfunc("TestEditions", str)
-print("Function call should return Base Edition, actually returns", result)
+print("Function should return 'Base Procedure', actually returns:",
+        repr(result))
 
 # the edition can be set upon connection
 connection = cx_Oracle.Connection(SampleEnv.EDITION_CONNECT_STRING,
         edition = SampleEnv.EDITION_NAME.upper())
 cursor = connection.cursor()
 result = cursor.callfunc("TestEditions", str)
-print("Function call should return Edition 1, actually returns", result)
+print("Function should return 'Edition 1 Procedure', actually returns:",
+        repr(result))
 
 # it can also be set via the environment variable ORA_EDITION
 os.environ["ORA_EDITION"] = SampleEnv.EDITION_NAME.upper()
 connection = cx_Oracle.Connection(SampleEnv.EDITION_CONNECT_STRING)
-print("Edition should be %s at this point, actual value is" % \
-        SampleEnv.EDITION_NAME.upper(), connection.edition)
+print("Edition should be", repr(SampleEnv.EDITION_NAME.upper()),
+        "actual value is:", repr(connection.edition))
 cursor = connection.cursor()
 result = cursor.callfunc("TestEditions", str)
-print("Function call should return Edition 1, actually returns", result)
+print("Function should return 'Edition 1 Procedure', actually returns:",
+        repr(result))