diff --git a/BatchBuild/IdeState.dcl b/BatchBuild/IdeState.dcl
index b0d51912dcb0b3491f16b95c0729b46624ff13e9..ab3026a88f11a774ba5786758f009cfab62c3222 100644
--- a/BatchBuild/IdeState.dcl
+++ b/BatchBuild/IdeState.dcl
@@ -48,8 +48,8 @@ setABCCache :: !*ABCCache !*GeneralSt -> *GeneralSt
 getFICache :: !*GeneralSt -> (FileInfoCache,*GeneralSt)
 setFICache :: !FileInfoCache !*GeneralSt -> *GeneralSt
 
-getPath :: !*GeneralSt -> (!Pathname,!*GeneralSt)
-setPath :: !Pathname !*GeneralSt -> *GeneralSt
+getProjectFilePath :: !*GeneralSt -> (!Pathname,!*GeneralSt)
+setProjectFilePath :: !Pathname !*GeneralSt -> *GeneralSt
 
 getStup :: !*GeneralSt -> (!Pathname,!*GeneralSt)
 
diff --git a/BatchBuild/IdeState.icl b/BatchBuild/IdeState.icl
index 1d214d75845043cb2418ea79dae595c982f68cc9..e7d0ff24e9aefc23d0be8747e71b0b524a9116c8 100644
--- a/BatchBuild/IdeState.icl
+++ b/BatchBuild/IdeState.icl
@@ -49,7 +49,7 @@ instance FileEnv GeneralSt where
 :: *General =
 	{ prefs			:: !Prefs
 	, project		:: !Project
-	, cache			:: !*(Maybe !*ABCCache)
+	, cache			:: !*(Maybe *ABCCache)
 	, fi_cache		:: !(Maybe FileInfoCache)
 	, pr_path		:: !Pathname			// proj_path
 	, stup			:: !Pathname			// appl_path
@@ -124,11 +124,11 @@ getFICache ps = accPLoc (\p=:{fi_cache = Just fi_cache}->(fi_cache,{p & fi_cache
 setFICache :: !FileInfoCache !*GeneralSt -> *GeneralSt
 setFICache ac ps = appPLoc (\p->{p & fi_cache = Just ac}) ps
 
-getPath :: !*GeneralSt -> (!Pathname,!*GeneralSt)
-getPath ps = ps!ls.pr_path
+getProjectFilePath :: !*GeneralSt -> (!Pathname,!*GeneralSt)
+getProjectFilePath ps = ps!ls.pr_path
 
-setPath :: !Pathname !*GeneralSt -> *GeneralSt
-setPath path ps = {ps & ls.pr_path = path}
+setProjectFilePath :: !Pathname !*GeneralSt -> *GeneralSt
+setProjectFilePath path ps = {ps & ls.pr_path = path}
 
 getStup :: !*GeneralSt -> (!Pathname,!*GeneralSt)
 getStup ps = ps!ls.stup