diff --git a/onos-setup.sh b/onos-setup.sh
index 2e29ba7..80b202f 100644
--- a/onos-setup.sh
+++ b/onos-setup.sh
@@ -57,3 +57,8 @@
 
 sudo -u tutorial1 cp /home/sdnip/configs/addresses.json /opt/onos/config/
 sudo -u tutorial1 cp /home/sdnip/configs/sdnip.json /opt/onos/config/
+
+# -------------- Copy optical config ----------
+sudo -u optical cp /home/tutorial1/onos/tools/test/topos/opticalUtils.py
+sudo -u optical cp /home/tutorial1/onos/tools/test/topos/opticalTest.py
+sudo -u optical cp /home/tutorial1/onos/tools/test/topos/opticalTestBig.py
diff --git a/opt-setup.sh b/opt-setup.sh
index 45f57e0..77b8534 100644
--- a/opt-setup.sh
+++ b/opt-setup.sh
@@ -37,7 +37,7 @@
 Name=Packet/Optical Mininet Small
 Name[en_US]=Packet/Optical Mininet Small
 Icon=konsole
-Exec=/usr/bin/lxterminal -e 'sudo /opt/onos/tools/test/topos/opticalTest.py'
+Exec=/usr/bin/lxterminal -e 'sudo -E ~/opticalTest.py'
 Comment[en_US]=
 EOF
 
@@ -48,7 +48,7 @@
 Name=Packet/Optical Mininet Large
 Name[en_US]=Packet/Optical Mininet Large
 Icon=konsole
-Exec=/usr/bin/lxterminal -e 'sudo /opt/onos/tools/test/topos/opticalTestBig.py'
+Exec=/usr/bin/lxterminal -e 'sudo -E ~/opticalTestBig.py'
 Comment[en_US]=
 EOF
 
@@ -56,8 +56,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Name=SDN-IP Tutorial
-Name[en_US]=SDN-IP Tutorial
+Name=Packet-Optical Tutorial
+Name[en_US]=Packet-Optical Tutorial
 Icon=internet-web-browser
 Exec=/usr/bin/chromium-browser https://wiki.onosproject.org/display/ONOS/Packet+Optical+Tutorial
 Comment[en_US]=