Index: trunk/Ohana/src/opihi/cmd.data/init.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/init.c	(revision 16117)
+++ trunk/Ohana/src/opihi/cmd.data/init.c	(revision 16119)
@@ -87,6 +87,6 @@
 int shift            PROTO((int, char **));
 int sort_vectors     PROTO((int, char **));
-int spline_apply     PROTO((int, char **));
-int spline_construct PROTO((int, char **));
+int spline_apply_cmd PROTO((int, char **));
+int spline_construct_cmd PROTO((int, char **));
 int stats            PROTO((int, char **));
 int style            PROTO((int, char **));
@@ -208,6 +208,6 @@
   {"shift",	   shift,	     "shift data in an image"},
   {"sort",    	   sort_vectors,     "sort list of vectors"},
-  {"spline.apply", spline_apply,     "apply spline fit to generate an image"},
-  {"spline.const", spline_construct, "create spline 2nd deriv. terms"},
+  {"spline.apply", spline_apply_cmd, "apply spline fit to generate an image"},
+  {"spline.const", spline_construct_cmd, "create spline 2nd deriv. terms"},
   {"stats",   	   stats,	     "give statistics on a portion of a buffer"},
   {"style",   	   style,	     "set the style for graph plots"},
Index: trunk/Ohana/src/opihi/cmd.data/spline_apply.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/spline_apply.c	(revision 16117)
+++ trunk/Ohana/src/opihi/cmd.data/spline_apply.c	(revision 16119)
@@ -1,8 +1,6 @@
 # include "data.h"
 
-void spline (float *x, float *y, int N, float *y2);
-float splint (float *x, float *y, float *y2, int N, float X);
-
-int spline_apply (int argc, char **argv) {
+// need to rename this as an image function
+int spline_apply_cmd (int argc, char **argv) {
   
   int i, j, I, J;
@@ -77,12 +75,12 @@
 	Ty2[j] = *V2;
       }
-      Tx1[i] = splint (Tyc, Ty1, Ty2, Ny, y);
+      Tx1[i] = spline_apply (Tyc, Ty1, Ty2, Ny, y);
     }
-    spline (Txc, Tx1, Nx, Tx2);
+    spline_construct (Txc, Tx1, Nx, Tx2);
 
     /* apply x-dir spline to new image */
     for (I = 0; I < nx; I++, V++) {
       x = I * rx;
-      *V = splint (Txc, Tx1, Tx2, Nx, x);
+      *V = spline_apply (Txc, Tx1, Tx2, Nx, x);
     }
   }
Index: trunk/Ohana/src/opihi/cmd.data/spline_construct.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/spline_construct.c	(revision 16117)
+++ trunk/Ohana/src/opihi/cmd.data/spline_construct.c	(revision 16119)
@@ -1,5 +1,6 @@
 # include "data.h"
 
-int spline_construct (int argc, char **argv) {
+// need to rename this as an image function
+int spline_construct_cmd (int argc, char **argv) {
   
   int i, j, Nx, Ny, xdir;
@@ -54,5 +55,5 @@
     }
   
-    spline (Tx, Ty, Ny, Ty2);
+    spline_construct (Tx, Ty, Ny, Ty2);
   
     /* copy derivatives to output buffer */