Index: trunk/Ohana/src/libohana/include/ohana.h
===================================================================
--- trunk/Ohana/src/libohana/include/ohana.h	(revision 14448)
+++ trunk/Ohana/src/libohana/include/ohana.h	(revision 14590)
@@ -187,18 +187,18 @@
 enum {TIME_NONE, TIME_DATE, TIME_DAYS, TIME_HOURS, TIME_MINUTES, TIME_SECONDS, TIME_JD, TIME_MJD};
 
-int     chk_time               PROTO((char *line));
-time_t  date_to_sec            PROTO((char *date));
-int     dms_to_ddd             PROTO((double *Value, char *string));
-time_t  jd_to_sec              PROTO((double jd));
-char   *sec_to_date            PROTO((time_t second));
-double  sec_to_jd              PROTO((time_t second));
-int     str_to_dtime           PROTO((char *line, double *second));
-int     str_to_time            PROTO((char *line, time_t *second));
-double  sec_to_mjd             PROTO((time_t second));
-time_t  mjd_to_sec             PROTO((double mjd));
+int     ohana_chk_time         PROTO((char *line));
+time_t  ohana_date_to_sec      PROTO((char *date));
+int     ohana_dms_to_ddd       PROTO((double *Value, char *string));
+time_t  ohana_jd_to_sec        PROTO((double jd));
+time_t  ohana_mjd_to_sec       PROTO((double mjd));
+char   *ohana_sec_to_date      PROTO((time_t second));
+double  ohana_sec_to_jd        PROTO((time_t second));
+int     ohana_str_to_dtime     PROTO((char *line, double *second));
+int     ohana_str_to_time      PROTO((char *line, time_t *second));
+double  ohana_sec_to_mjd       PROTO((time_t second));
 double  ohana_lst              PROTO((double jd, double longitude));
+int     ohana_str_to_radec     PROTO((double *ra, double *dec, char *str1, char *str2));
 
 int     hstgsc_hms_to_deg      PROTO((double *h0, double *h1, double *d0, double *d1, char *string));
-int     str_to_radec           PROTO((double *ra, double *dec, char *str1, char *str2));
 
 /* IO Buffer functions */
Index: trunk/Ohana/src/libohana/src/time.c
===================================================================
--- trunk/Ohana/src/libohana/src/time.c	(revision 14448)
+++ trunk/Ohana/src/libohana/src/time.c	(revision 14590)
@@ -2,5 +2,5 @@
 
 /***** convert [-]00:00:00 to 0.0000 ****/
-int dms_to_ddd (double *Value, char *string) {
+int ohana_dms_to_ddd (double *Value, char *string) {
   
   int valid, neg, status;
@@ -58,10 +58,10 @@
 
 /**********/
-int str_to_radec (double *ra, double *dec, char *str1, char *str2) {
+int ohana_str_to_radec (double *ra, double *dec, char *str1, char *str2) {
 
   double Ra, Dec;
 
   *ra = *dec = 0;
-  switch (dms_to_ddd (&Ra, str1)) {
+  switch (ohana_dms_to_ddd (&Ra, str1)) {
     case 0:
       fprintf (stderr, "syntax error in RA\n");
@@ -73,5 +73,5 @@
       break;
   }
-  switch (dms_to_ddd (&Dec, str2)) {
+  switch (ohana_dms_to_ddd (&Dec, str2)) {
     case 0:
       fprintf (stderr, "syntax error in DEC\n");
@@ -87,5 +87,5 @@
 
 /**********/
-int chk_time (char *line) {
+int ohana_chk_time (char *line) {
 
   char *p1, *p2;
@@ -120,5 +120,5 @@
 
 /**********/
-int str_to_time (char *line, time_t *second) {
+int ohana_str_to_time (char *line, time_t *second) {
   
   char *tmpline;
@@ -141,5 +141,5 @@
       gmt   = gmtime (&tsec);
       sprintf (tmpline, "%04d/%02d/%02d,%s", 1900 + gmt[0].tm_year, gmt[0].tm_mon+1, gmt[0].tm_mday, &line[6]);
-      *second = date_to_sec (tmpline);
+      *second = ohana_date_to_sec (tmpline);
       free (tmpline);
       return (TRUE);
@@ -150,9 +150,9 @@
   }
     
-  switch (chk_time (line)) {
+  switch (ohana_chk_time (line)) {
     case 0:
       return (FALSE);
     case TIME_DATE:
-      *second = date_to_sec (line);
+      *second = ohana_date_to_sec (line);
       return (TRUE);
     case TIME_DAYS:
@@ -170,9 +170,9 @@
     case TIME_JD:
       jd = strtod (line, 0);
-      *second = jd_to_sec (jd);
+      *second = ohana_jd_to_sec (jd);
       return (TRUE);
     case TIME_MJD:
       jd = strtod (line, 0);
-      *second = mjd_to_sec (jd);
+      *second = ohana_mjd_to_sec (jd);
       return (TRUE);
   }
@@ -182,7 +182,7 @@
 
 /**********/
-int str_to_dtime (char *line, double *second) {
-  
-  switch (chk_time (line)) {
+int ohana_str_to_dtime (char *line, double *second) {
+  
+  switch (ohana_chk_time (line)) {
     case 0:
     case TIME_JD:
@@ -207,5 +207,5 @@
 
 /**********/
-double sec_to_jd (time_t second) {
+double ohana_sec_to_jd (time_t second) {
 
   double jd;
@@ -216,5 +216,5 @@
 
 /**********/
-time_t jd_to_sec (double jd) {
+time_t ohana_jd_to_sec (double jd) {
 
   time_t second;
@@ -225,5 +225,5 @@
 
 /**********/
-double sec_to_mjd (time_t second) {
+double ohana_sec_to_mjd (time_t second) {
 
   double mjd;
@@ -234,5 +234,5 @@
 
 /**********/
-time_t mjd_to_sec (double mjd) {
+time_t ohana_mjd_to_sec (double mjd) {
 
   time_t second;
@@ -243,5 +243,5 @@
 
 /**********/
-char *sec_to_date (time_t second) {
+char *ohana_sec_to_date (time_t second) {
   
   struct tm *gmt;
@@ -256,5 +256,5 @@
 
 /***** date in format yyyy/mm/dd,hh:mm:ss *****/
-time_t date_to_sec (char *date) {
+time_t ohana_date_to_sec (char *date) {
   
   time_t second;