Index: branches/rel10_ifa/psModules/src/pslib/Makefile.am
===================================================================
--- branches/rel10_ifa/psModules/src/pslib/Makefile.am	(revision 6564)
+++ branches/rel10_ifa/psModules/src/pslib/Makefile.am	(revision 6565)
@@ -4,5 +4,5 @@
 libpsmodulepslib_la_LDFLAGS  = -release $(PACKAGE_VERSION)
 libpsmodulepslib_la_SOURCES  = \
-    psAdditionals.c \
+    psEllipse.c \
     psImageJpeg.c \
     psLine.c \
@@ -12,5 +12,5 @@
 psmoduleincludedir = $(includedir)
 psmoduleinclude_HEADERS = \
-    psAdditionals.h \
+    psEllipse.h \
     psImageJpeg.h \
     psLine.h \
Index: branches/rel10_ifa/psModules/src/pslib/psEllipse.c
===================================================================
--- branches/rel10_ifa/psModules/src/pslib/psEllipse.c	(revision 6564)
+++ branches/rel10_ifa/psModules/src/pslib/psEllipse.c	(revision 6565)
@@ -2,8 +2,8 @@
 # include "psEllipse.h"
 
-EllipseAxes EllipseMomentsToAxes (EllipseMoments moments)
+psEllipseAxes psEllipseMomentsToAxes (psEllipseMoments moments)
 {
 
-    EllipseAxes axes;
+    psEllipseAxes axes;
 
     double f = sqrt (0.25*PS_SQR(moments.x2 - moments.y2) + PS_SQR(moments.xy));
@@ -20,8 +20,8 @@
 }
 
-EllipseShape EllipseAxesToShape (EllipseAxes axes)
+psEllipseShape psEllipseAxesToShape (psEllipseAxes axes)
 {
 
-    EllipseShape shape;
+    psEllipseShape shape;
 
     double r1 = 1.0 / PS_SQR(axes.major) + 1.0 / PS_SQR(axes.minor);
@@ -38,8 +38,8 @@
 }
 
-EllipseAxes EllipseShapeToAxes (EllipseShape shape)
+psEllipseAxes psEllipseShapeToAxes (psEllipseShape shape)
 {
 
-    EllipseAxes axes;
+    psEllipseAxes axes;
 
     double f1 = 1.0 / PS_SQR(shape.sx) + 1.0 / PS_SQR(shape.sy);
Index: branches/rel10_ifa/psModules/src/pslib/psEllipse.h
===================================================================
--- branches/rel10_ifa/psModules/src/pslib/psEllipse.h	(revision 6564)
+++ branches/rel10_ifa/psModules/src/pslib/psEllipse.h	(revision 6565)
@@ -6,5 +6,5 @@
     double theta;
 }
-EllipseAxes;
+psEllipseAxes;
 
 typedef struct
@@ -14,5 +14,5 @@
     double xy;
 }
-EllipseMoments;
+psEllipseMoments;
 
 typedef struct
@@ -22,9 +22,9 @@
     double sxy;
 }
-EllipseShape;
+psEllipseShape;
 
 // conversions between elliptical shape representations
-EllipseAxes EllipseMomentsToAxes (EllipseMoments moments);
-EllipseShape EllipseAxesToShape (EllipseAxes axes);
-EllipseAxes EllipseShapeToAxes (EllipseShape shape);
+psEllipseAxes psEllipseMomentsToAxes (psEllipseMoments moments);
+psEllipseShape psEllipseAxesToShape (psEllipseAxes axes);
+psEllipseAxes psEllipseShapeToAxes (psEllipseShape shape);