diff --git a/layout-manual.c b/layout-manual.c
index d0815cae..f08fd731 100644
--- a/layout-manual.c
+++ b/layout-manual.c
@@ -1,4 +1,4 @@
-/* $Id: layout-manual.c,v 1.2 2009-05-18 21:06:16 nicm Exp $ */
+/* $Id: layout-manual.c,v 1.3 2009-05-18 21:29:11 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -20,10 +20,10 @@
 
 #include "tmux.h"
 
-void	layout_manual_vertical_update_offsets(struct window *);
+void	layout_manual_v_update_offsets(struct window *);
 
 void
-layout_manual_vertical_refresh(struct window *w, unused int active_only)
+layout_manual_v_refresh(struct window *w, unused int active_only)
 {
 	struct window_pane	*wp;
 	u_int			 npanes, canfit, total;
@@ -102,14 +102,14 @@ layout_manual_vertical_refresh(struct window *w, unused int active_only)
 	}
 
 	/* Fill in the offsets. */
-	layout_manual_vertical_update_offsets(w);
+	layout_manual_v_update_offsets(w);
 
 	/* Switch the active window if necessary. */
 	window_set_active_pane(w, w->active);
 }
 
 void
-layout_manual_vertical_resize(struct window_pane *wp, int adjust)
+layout_manual_v_resize(struct window_pane *wp, int adjust)
 {
 	struct window		*w = wp->window;
 	struct window_pane	*wq;
@@ -163,11 +163,11 @@ layout_manual_vertical_resize(struct window_pane *wp, int adjust)
 		}
 	}
 
-	layout_manual_vertical_update_offsets(w);
+	layout_manual_v_update_offsets(w);
 }
 
 void
-layout_manual_vertical_update_offsets(struct window *w)
+layout_manual_v_update_offsets(struct window *w)
 {
 	struct window_pane     *wp;
 	u_int			yoff;
diff --git a/layout.c b/layout.c
index 0c8cc607..3b394e94 100644
--- a/layout.c
+++ b/layout.c
@@ -1,4 +1,4 @@
-/* $Id: layout.c,v 1.10 2009-05-18 21:16:09 nicm Exp $ */
+/* $Id: layout.c,v 1.11 2009-05-18 21:29:11 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,21 +32,20 @@
  */
 
 void	layout_active_only_refresh(struct window *, int);
-void	layout_even_horizontal_refresh(struct window *, int);
-void	layout_even_vertical_refresh(struct window *, int);
-void	layout_left_vertical_refresh(struct window *, int);
+void	layout_even_h_refresh(struct window *, int);
+void	layout_even_v_refresh(struct window *, int);
+void	layout_left_v_refresh(struct window *, int);
 
 const struct {
 	const char     *name;
 	void		(*refresh)(struct window *, int);
 	void		(*resize)(struct window_pane *, int);
 } layouts[] = {
-	{ "manual-vertical",
-	  layout_manual_vertical_refresh, layout_manual_vertical_resize },
+	{ "manual-vertical", layout_manual_v_refresh, layout_manual_v_resize },
 	{ "active-only", layout_active_only_refresh, NULL },
-	{ "even-horizontal", layout_even_horizontal_refresh, NULL },
-	{ "even-vertical", layout_even_vertical_refresh, NULL },
-	{ "left-vertical", layout_left_vertical_refresh, NULL },
+	{ "even-horizontal", layout_even_h_refresh, NULL },
+	{ "even-vertical", layout_even_v_refresh, NULL },
+	{ "left-vertical", layout_left_v_refresh, NULL },
 };
 
 const char *
@@ -136,7 +135,7 @@ layout_active_only_refresh(struct window *w, unused int active_only)
 }
 
 void
-layout_even_horizontal_refresh(struct window *w, int active_only)
+layout_even_h_refresh(struct window *w, int active_only)
 {
 	struct window_pane	*wp;
 	u_int			 i, n, width, xoff;
@@ -184,7 +183,7 @@ layout_even_horizontal_refresh(struct window *w, int active_only)
 }
 
 void
-layout_even_vertical_refresh(struct window *w, int active_only)
+layout_even_v_refresh(struct window *w, int active_only)
 {
 	struct window_pane	*wp;
 	u_int			 i, n, height, yoff;
@@ -232,7 +231,7 @@ layout_even_vertical_refresh(struct window *w, int active_only)
 }
 
 void
-layout_left_vertical_refresh(struct window *w, int active_only)
+layout_left_v_refresh(struct window *w, int active_only)
 {
 	struct window_pane	*wp;
 	u_int			 i, n, height, yoff;
diff --git a/tmux.h b/tmux.h
index 1d6c947e..ff75ec61 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.321 2009-05-18 21:16:09 nicm Exp $ */
+/* $Id: tmux.h,v 1.322 2009-05-18 21:29:11 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1575,8 +1575,8 @@ void		 layout_next(struct window *);
 void		 layout_previous(struct window *);
 
 /* layout-manual.c */
-void		 layout_manual_vertical_refresh(struct window *, int);
-void		 layout_manual_vertical_resize(struct window_pane *, int);
+void		 layout_manual_v_refresh(struct window *, int);
+void		 layout_manual_v_resize(struct window_pane *, int);
 
 /* window-clock.c */
 extern const struct window_mode window_clock_mode;