diff --git a/wmsun/Makefile b/wmsun/Makefile
index 81f0f67..20e26a6 100644
--- a/wmsun/Makefile
+++ b/wmsun/Makefile
@@ -16,26 +16,26 @@ LIBS   = -lXpm -lX11 -lXext -lm
 #
 # LIBS   = -lXpm -lX11 -lXext -lsocket
 
-OBJS   = wmSun.o SunRise.o wmgeneral/wmgeneral.o
+OBJS   = wmsun.o SunRise.o wmgeneral/wmgeneral.o
 
 .c.o:
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
 
-all:	wmSun.o wmSun
+all:	wmsun.o wmsun
 
-wmSun.o: wmSun_master.xpm wmSun_mask.xbm
+wmsun.o: wmSun_master.xpm wmSun_mask.xbm
 
-wmSun:	$(OBJS)
-	$(CC) $(LDFLAGS) -o wmSun $^ $(LIBS)
+wmsun:	$(OBJS)
+	$(CC) $(LDFLAGS) -o wmsun $^ $(LIBS)
 
 clean:
 	for i in $(OBJS) ; do \
 		rm -f $$i; \
 	done
-	rm -f wmSun
+	rm -f wmsun
 
-install:: wmSun
+install:: wmsun
 	$(INSTALL) -d $(DESTDIR)$(BINDIR)
-	$(INSTALL) wmSun $(DESTDIR)$(BINDIR)
+	$(INSTALL) wmsun $(DESTDIR)$(BINDIR)
 	$(INSTALL) -d $(DESTDIR)$(MANDIR)
-	$(INSTALL) -m 644 wmSun.1 $(DESTDIR)$(MANDIR)
+	$(INSTALL) -m 644 wmsun.1 $(DESTDIR)$(MANDIR)
diff --git a/wmsun/wmSun.1 b/wmsun/wmsun.1
similarity index 100%
rename from wmsun/wmSun.1
rename to wmsun/wmsun.1
diff --git a/wmsun/wmSun.c b/wmsun/wmsun.c
similarity index 99%
rename from wmsun/wmSun.c
rename to wmsun/wmsun.c
index a0ad31b..16038e5 100644
--- a/wmsun/wmSun.c
+++ b/wmsun/wmsun.c
@@ -368,7 +368,7 @@ void ParseCMDLine(int argc, char *argv[]) {
 
 	} else {
 	    printf("\nwmSun version: %s\n", WMSUN_VERSION);
-	    printf("\nusage: wmSun [-display <Display>] [-lat <Latitude>] [-lon <Longitude>] [-h]\n\n");
+	    printf("\nusage: wmsun [-display <Display>] [-lat <Latitude>] [-lon <Longitude>] [-h]\n\n");
 	    printf("\t-display <Display>\tUse alternate X display.\n");
 	    printf("\t-geometry <Geometry>\tSet window geometry.\n");
 	    printf("\t-lat <Latitude>\t\tObservers Latitude. Positive to the west.\n");