Reverted to basic path names