--- a/usr/src/cmd/text-install/helpfiles/disks.txt	Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/text-install/helpfiles/disks.txt	Tue Aug 16 20:54:07 2011 +0000
@@ -14,11 +14,11 @@
 
 SIZE
 
-The recommended size and minimum size for the Oracle Solaris OS installation are displayed. The size of each device is displayed in gigabytes. 
+The recommended size and minimum size for the OpenIndiana OS installation are displayed. The size of each device is displayed in gigabytes. 
 
 * Devices that are too small for a successful installation are labeled that way. 
 
-* Some devices may be so large that an Oracle Solaris installation cannot use all the space on the device. These devices have a maximum installation size specified.
+* Some devices may be so large that an OpenIndiana installation cannot use all the space on the device. These devices have a maximum installation size specified.
 
 PARTITIONS OR SLICES
 

--- a/usr/src/cmd/text-install/helpfiles/sparc_solaris_slices.txt	Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/text-install/helpfiles/sparc_solaris_slices.txt	Tue Aug 16 20:54:07 2011 +0000
@@ -10,7 +10,7 @@
 
      * If you select "Use the whole disk," the installer records that choice and proceeds to the next task.
 
-       CAUTION: The "Use the whole disk" selection erases the entire disk during installation. The disk is overwritten with the new Oracle Solaris OS. 
+       CAUTION: The "Use the whole disk" selection erases the entire disk during installation. The disk is overwritten with the new OpenIndiana OS. 
 
 Press F2 to continue to the next screen.
 

--- a/usr/src/cmd/text-install/helpfiles/sparc_solaris_slices_select.txt	Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/text-install/helpfiles/sparc_solaris_slices_select.txt	Tue Aug 16 20:54:07 2011 +0000
@@ -6,7 +6,7 @@
 
 GUIDELINES
 
-* You can have only one rpool in the device. And, Oracle Solaris will be installed into the rpool. 
+* You can have only one rpool in the device. And, OpenIndiana will be installed into the rpool. 
 
 * The size of the rpool can be increased up to the maximum available size. When slices are shown as Unused, its available space is displayed in the available (Avail) column. You can change a slice to Unused, making its space available to adjacent slices.
 

--- a/usr/src/cmd/text-install/helpfiles/welcome.txt	Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/text-install/helpfiles/welcome.txt	Tue Aug 16 20:54:07 2011 +0000
@@ -1,8 +1,8 @@
 WELCOME
 
-This text installer enables you to install the Oracle Solaris Operating System (OS) on SPARC or x86 systems. This installer, in particular, can be used on machines that either do not have or do not need graphics cards.
+This text installer enables you to install OpenIndiana on your system. It installs a minimal server-oriented package set, for example omitting the GNOME desktop.
 
-Note: This initial installation of the Oracle Solaris OS overwrites the existing Solaris or Oracle Solaris OS with the new version of the Oracle Solaris OS. If you want to upgrade an existing Oracle Solaris OS, use the pkg(1) command or the Package Manager application instead of this installer.
+Note: This installer will overwrite any currently installed Operating System. If you wish to upgrade an existing OpenIndiana installation, use the pkg(1) command or the Package Manager application instead of this installer.
 
 PROCEDURE
 

--- a/usr/src/cmd/text-install/helpfiles/x86_fdisk_partitions.txt	Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/text-install/helpfiles/x86_fdisk_partitions.txt	Tue Aug 16 20:54:07 2011 +0000
@@ -12,7 +12,7 @@
 
      * If you select "Use the whole disk," the installer records that choice and proceeds to the next task.
 
-       CAUTION: "Use the whole disk" erases the entire disk during installation. The disk is overwritten with the new Oracle Solaris OS. 
+       CAUTION: "Use the whole disk" erases the entire disk during installation. The disk is overwritten with the new OpenIndiana OS. 
 
 After making your selection, press F2 to continue to the next screen.
 

--- a/usr/src/cmd/text-install/helpfiles/x86_fdisk_partitions_select.txt	Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/text-install/helpfiles/x86_fdisk_partitions_select.txt	Tue Aug 16 20:54:07 2011 +0000
@@ -38,7 +38,7 @@
 
      * If there is no existing Solaris partition, select a partition and change its type to Solaris. 
 
-     * LINUX-SWAP INSTRUCTIONS: If you used a third-party partitioning tool such as GParted, this screen displays a partition named Linux-swap on which you can install the Oracle Solaris OS software. To use this partition, you need to change the type from Linux-swap to Solaris in this screen. Highlight that partition and press F5 repeatedly to cycle through the types until the Solaris type is displayed for that partition.
+     * LINUX-SWAP INSTRUCTIONS: If you used a third-party partitioning tool such as GParted, this screen displays a partition named Linux-swap on which you can install the OpenIndiana OS software. To use this partition, you need to change the type from Linux-swap to Solaris in this screen. Highlight that partition and press F5 repeatedly to cycle through the types until the Solaris type is displayed for that partition.
 
 OPTIONAL: You can make further optional modifications to the partition layout. The changes you make will be implemented during the installation. To record layout changes, first use the arrow keys to highlight the partition that you want to modify. Then perform any of the following actions:
 

--- a/usr/src/cmd/text-install/helpfiles/x86_fdisk_slices.txt	Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/text-install/helpfiles/x86_fdisk_slices.txt	Tue Aug 16 20:54:07 2011 +0000
@@ -1,6 +1,6 @@
 x86: SOLARIS PARTITION SLICES
 
-If Solaris VTOC slices are in a Solaris partition that you selected in the prior screen, this screen lists the VTOC slices. You can choose to install the Oracle Solaris OS in one of the slices. Or you can use the whole partition for the installation. 
+If Solaris VTOC slices are in a Solaris partition that you selected in the prior screen, this screen lists the VTOC slices. You can choose to install the OpenIndiana OS in one of the slices. Or you can use the whole partition for the installation. 
 
 The existing VTOC slices are displayed in layout order.
 

--- a/usr/src/cmd/text-install/helpfiles/x86_fdisk_slices_select.txt	Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/text-install/helpfiles/x86_fdisk_slices_select.txt	Tue Aug 16 20:54:07 2011 +0000
@@ -6,7 +6,7 @@
 
 GUIDELINES
 
-* You can have only one rpool in the partition, and Oracle Solaris will be installed in the rpool.  
+* You can have only one rpool in the partition, and OpenIndiana will be installed in the rpool.  
 
 * The size of the rpool can be increased up to the maximum available size. When slices are shown as Unused, its available space is displayed in the available (Avail) column. You can change a slice to Unused, making its space available to adjacent slices.
 

--- a/usr/src/cmd/text-install/osol_install/text_install/__init__.py	Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/text-install/osol_install/text_install/__init__.py	Tue Aug 16 20:54:07 2011 +0000
@@ -48,6 +48,6 @@
               "%(filename)s:%(lineno)d %(message)s")
 LOG_LEVEL_INPUT = 5
 LOG_NAME_INPUT = "INPUT"
-RELEASE = {"release" : _("Oracle Solaris")}
+RELEASE = {"release" : _("OpenIndiana")}
 
 environ.setdefault("ESCDELAY", "200")

--- a/usr/src/cmd/text-install/osol_install/text_install/partition_edit_screen.py	Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/text-install/osol_install/text_install/partition_edit_screen.py	Tue Aug 16 20:54:07 2011 +0000
@@ -46,7 +46,7 @@
     
     '''
     
-    PARTITION_PARAGRAPH = _("Oracle Solaris will be installed into the Solaris "
+    PARTITION_PARAGRAPH = _("OpenIndiana will be installed into the Solaris "
                             "partition. A partition's type can be changed"
                             " using the F5 key.\n\n"
                             "A partition's size can be increased "

--- a/usr/src/cmd/text-install/osol_install/text_install/text_install.py	Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/text-install/osol_install/text_install/text_install.py	Tue Aug 16 20:54:07 2011 +0000
@@ -23,7 +23,7 @@
 #
 
 '''
-Text / (n)Curses based UI for installing Oracle Solaris
+Text / (n)Curses based UI for installing OpenIndiana
 '''
 
 import curses

--- a/usr/src/cmd/text-install/osol_install/text_install/ti_install.py	Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/text-install/osol_install/text_install/ti_install.py	Tue Aug 16 20:54:07 2011 +0000
@@ -228,11 +228,11 @@
         logging.debug("Root pool %s does not exist", rootpool_name)
         return   # rpool doesn't exist, no need to clean up
 
-    # Check value of rpool's org.opensolaris.caiman:install property
+    # Check value of rpool's org.openindiana.caiman:install property
     # If it is busy, that means the pool is left over from an aborted install.
     # If the property doesn't exist or has another value, we assume
     # that the root pool contains valid Solaris instance.
-    cmd = "/usr/sbin/zfs get -H -o value org.opensolaris.caiman:install " + \
+    cmd = "/usr/sbin/zfs get -H -o value org.openindiana.caiman:install " + \
           rootpool_name
     logging.debug("Executing: %s", cmd)
     (status, pool_status) = commands.getstatusoutput(cmd)

--- a/usr/src/cmd/text-install/svc/text-mode-menu.ksh	Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/text-install/svc/text-mode-menu.ksh	Tue Aug 16 20:54:07 2011 +0000
@@ -44,7 +44,7 @@
 
 # Define the menu of commands and prompts
 menu_items=( \
-    (menu_str=`gettext "Install Oracle Solaris"`			 \
+    (menu_str=`gettext "Install OpenIndiana"`			 \
 	cmds=("/usr/bin/text-install")					 \
 	do_subprocess="true"						 \
 	msg_str="")							 \
@@ -172,7 +172,7 @@
 	# Display the menu.
 	clear
 	printf \
-	    "`gettext 'Welcome to the Oracle Solaris %s installation menu'`" \
+	    "`gettext 'Welcome to the OpenIndiana %s installation menu'`" \
 	    "`uname -v`"
 	printf " \n\n"
 	for i in "${!menu_items[@]}"; do