modules/chempy/__init__.py          |    2 +-
 modules/chempy/tinker/__init__.py   |    2 +-
 modules/pymol/commanding.py         |    6 +++---
 modules/pymol/importing.py          |    2 +-
 modules/pymol/wizard/mutagenesis.py |    4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/chempy/__init__.py b/modules/chempy/__init__.py
index 998e8f8..02fe156 100644
--- a/modules/chempy/__init__.py
+++ b/modules/chempy/__init__.py
@@ -229,7 +229,7 @@ if os.environ.has_key('CHEMPY_DATA'):  #
 elif os.environ.has_key('PYMOL_DATA'):
     path = os.environ['PYMOL_DATA'] + '/chempy/'
 elif os.environ.has_key('PYMOL_PATH'):
-    path = os.environ['PYMOL_PATH'] + '/data/chempy/'   
+    path = os.environ['PYMOL_PATH'] + '/chempy/'   
 elif os.environ.has_key('FREEMOL_MODULES'):
     path = os.environ['FREEMOL_MODULES'] + '/chempy/'
 else:
diff --git a/modules/chempy/tinker/__init__.py b/modules/chempy/tinker/__init__.py
index a2d8eb1..1e48f81 100644
--- a/modules/chempy/tinker/__init__.py
+++ b/modules/chempy/tinker/__init__.py
@@ -147,7 +147,7 @@ else:
 
 if os.environ.has_key('PYMOL_PATH'):
     pymol_path = os.environ['PYMOL_PATH']
-    test_path = pymol_path + '/data/chempy/tinker/'
+    test_path = pymol_path + '/chempy/tinker/'
     if os.path.exists(test_path):
         params_path = test_path
 
diff --git a/modules/pymol/commanding.py b/modules/pymol/commanding.py
index 5a202d0..5cb27a6 100644
--- a/modules/pymol/commanding.py
+++ b/modules/pymol/commanding.py
@@ -219,11 +219,11 @@ USAGE
                 _self.unlock(0,_self)
             r = DEFAULT_SUCCESS
             if show_splash==1: # generic / open-source
-                png_path = _self.exp_path("$PYMOL_PATH/data/pymol/splash.png")
+                png_path = _self.exp_path("$PYMOL_DATA/pymol/splash.png")
             elif show_splash==2: # evaluation builds
-                png_path = _self.exp_path("$PYMOL_PATH/data/pymol/epymol.png")
+                png_path = _self.exp_path("$PYMOL_DATA/pymol/epymol.png")
             else: # incentive builds
-                png_path = _self.exp_path("$PYMOL_PATH/data/pymol/ipymol.png")
+                png_path = _self.exp_path("$PYMOL_DATA/pymol/ipymol.png")
             if os.path.exists(png_path):
                 _self.do("_ cmd.load_png('%s',0,quiet=1)"%png_path)
         else:
diff --git a/modules/pymol/importing.py b/modules/pymol/importing.py
index 1ccf986..72ae9f3 100644
--- a/modules/pymol/importing.py
+++ b/modules/pymol/importing.py
@@ -191,7 +191,7 @@ SEE ALSO
     '''
         r = DEFAULT_ERROR
         
-        tables = { 'cmyk' : "$PYMOL_PATH/data/pymol/cmyk.png",
+        tables = { 'cmyk' : "$PYMOL_DATA/pymol/cmyk.png",
                    'pymol' : 'pymol',
                    'rgb' : 'rgb',
                    'greyscale': 'greyscale' }
diff --git a/modules/pymol/wizard/mutagenesis.py b/modules/pymol/wizard/mutagenesis.py
index 8a5250d..6c1b26c 100644
--- a/modules/pymol/wizard/mutagenesis.py
+++ b/modules/pymol/wizard/mutagenesis.py
@@ -53,7 +53,7 @@ class Mutagenesis(Wizard):
         self.dep = default_dep
 
         self.ind_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+
-                                           "/data/chempy/sidechains/sc_bb_ind.pkl")
+                                           "/chempy/sidechains/sc_bb_ind.pkl")
         self.load_library()
         self.status = 0 # 0 no selection, 1 mutagenizing
         self.bump_check = 1
@@ -218,7 +218,7 @@ class Mutagenesis(Wizard):
         if self.dep == 'dep':
             if not hasattr(self,'dep_library'):
                 self.dep_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+
-                                           "/data/chempy/sidechains/sc_bb_dep.pkl")
+                                           "/chempy/sidechains/sc_bb_dep.pkl")
             
     def set_mode(self,mode):
         cmd=self.cmd