diff --git a/config.cpp b/config.cpp
index ec89bcb1..371deaa3 100644
--- a/config.cpp
+++ b/config.cpp
@@ -1462,7 +1462,7 @@ EX void loadConfig() {
   geom3::apply_always3();
   polygonal::solve();
   check_cgi();
-  cgi.prepare_basics();
+  cgi.require_basics();
   }
 #endif
 
diff --git a/euclid.cpp b/euclid.cpp
index f4087ec6..f70662fe 100644
--- a/euclid.cpp
+++ b/euclid.cpp
@@ -142,7 +142,7 @@ EX namespace euc {
     map<gp::loc, struct cdata> eucdata;
     
     void compute_tmatrix() {
-      cgi.prepare_basics();
+      cgi.require_basics();
       shifttable = get_shifttable();
       tmatrix.resize(S7);
       for(int i=0; i<S7; i++) tmatrix[i] = eumove(shifttable[i]);
diff --git a/fake.cpp b/fake.cpp
index 6a830ac5..d478e13b 100644
--- a/fake.cpp
+++ b/fake.cpp
@@ -686,7 +686,7 @@ EX void change_around() {
 
     /* to compute scale */
     if(WDIM == 2)
-      cgi.prepare_basics();
+      cgi.require_basics();
     }
 
   t = scale / t;
diff --git a/geometry.cpp b/geometry.cpp
index 68f7ab07..e7a3d923 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -1106,7 +1106,7 @@ EX namespace geom3 {
     if(vid.always3) swapdim(-1);
     vid.always3 = !vid.always3;
     apply_always3();
-    check_cgi(); cgi.prepare_basics();
+    check_cgi(); cgi.require_basics();
     if(vid.always3) swapdim(+1);
     }
   #endif
diff --git a/sky.cpp b/sky.cpp
index 811ce3c1..da01ae0a 100644
--- a/sky.cpp
+++ b/sky.cpp
@@ -633,7 +633,7 @@ EX void make_air() {
     geom3::apply_always3();
     check_cgi();
     missing = !(cgi.state & 2);
-    cgi.prepare_basics();
+    cgi.require_basics();
     geom3::swap_direction = -1;
     if(missing) {
       swap(cgi.emb, cgi1->emb);