Index: trunk/Ohana/src/opihi/cmd.astro/ctimes.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.astro/ctimes.c	(revision 14501)
+++ trunk/Ohana/src/opihi/cmd.astro/ctimes.c	(revision 14590)
@@ -29,5 +29,5 @@
     value = atof (argv[2]);
     time = TimeRef (value, TimeReference, TimeFormat);
-    date = sec_to_date (time);
+    date = ohana_sec_to_date (time);
     
     if (Variable != (char *) NULL) {
@@ -48,5 +48,5 @@
     }
 
-    if (!str_to_time (argv[2], &time)) { 
+    if (!ohana_str_to_time (argv[2], &time)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
Index: trunk/Ohana/src/opihi/cmd.astro/getlst.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.astro/getlst.c	(revision 14501)
+++ trunk/Ohana/src/opihi/cmd.astro/getlst.c	(revision 14590)
@@ -16,5 +16,5 @@
   if (argc != 3) goto syntax;
 
-  if (!str_to_time (argv[1], &time)) {
+  if (!ohana_str_to_time (argv[1], &time)) {
       if (Variable != NULL) free (Variable);
       return (FALSE);
@@ -23,5 +23,5 @@
   longitude = atof (argv[2]);
 
-  jd = sec_to_jd (time);
+  jd = ohana_sec_to_jd (time);
   fprintf (stderr, "jd: %f\n", jd);
 
Index: trunk/Ohana/src/opihi/cmd.astro/region.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.astro/region.c	(revision 14501)
+++ trunk/Ohana/src/opihi/cmd.astro/region.c	(revision 14590)
@@ -58,5 +58,5 @@
   }
   
-  if (!str_to_radec (&Ra, &Dec, argv[1], argv[2])) return (FALSE);
+  if (!ohana_str_to_radec (&Ra, &Dec, argv[1], argv[2])) return (FALSE);
   Radius = atof (argv[3]);
   strcpy (graphmode.coords.ctype, "RA---TAN");
Index: trunk/Ohana/src/opihi/cmd.astro/sexigesimal.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.astro/sexigesimal.c	(revision 14501)
+++ trunk/Ohana/src/opihi/cmd.astro/sexigesimal.c	(revision 14590)
@@ -23,5 +23,5 @@
 
   if (HMS) {
-    if (!dms_to_ddd (&value, argv[1])) {
+    if (!ohana_dms_to_ddd (&value, argv[1])) {
       gprint (GP_ERR, "syntax error in input\n");
       return (FALSE);