33 files changed, 530 insertions, 113 deletions

diff --git a/src/controller/callbacks/mouse.c b/src/controller/callbacks/mouse.c
index fc48eff..16e8b8b 100644
--- a/src/controller/callbacks/mouse.c
+++ b/src/controller/callbacks/mouse.c
@@ -1,7 +1,7 @@
 #include "../../util/check_error.h"
 #include "../../util/pick_convert.h"
-#include "../../view/exp004geometry.h"
-#include "../../view/exp004state0.h"
+#include "../../view/geometry.h"
+#include "../../view/state0.h"
 #include "../actions/process_hits.h"
 #include "../actions/set_ortho.h"
 #include "../actions/zoom.h"
@@ -14,7 +14,7 @@
 /*
  * A simple alias to make the code more readable.
  */
-#define S exp004state0
+#define S state0
 
 void
 mouse (int button, int state, int x, int y)
@@ -94,7 +94,7 @@ mouse (int button, int state, int x, int y)
 	   * manipulate the name stack so that each primitive of interest
 	   * has appropriate names assigned [Redbook]."
 	   */
-	  exp004geometry (GL_SELECT);
+	  geometry (GL_SELECT);
 
 	  glMatrixMode (GL_PROJECTION);
 	  glPopMatrix ();