commit - 4f20f2bb803af25b4a2c304819ef73ff5d0a3cb8
commit + e90991485f5534e15ed96db020f9eb531ff04b7c
blob - 9e198099b539342a95f50aceb66b1f5b88c7bd96
blob + 5ecf4853fe1d024726a75e43449af4c6e19fd4f3
--- aui.h
+++ aui.h
@@ -56,21 +56,21 @@ struct aui_frame;
 struct aui_canvas;	  /* rendering free of rules */
 struct aui_button;
 
-struct aui_windowconfig {
+struct aui_window_config {
 	unsigned int width;
 	unsigned int height;
 	const char *title; /* Not allocated by libaui */
 };
 
-struct aui_buttonconfig {
+struct aui_button_config {
 	const char *text; /* Not allocated by libaui */
 };
 
-struct aui_frameconfig {
+struct aui_frame_config {
 	struct aui_color bg;
 };
 
-struct aui_canvasconfig {
+struct aui_canvas_config {
 	struct aui_color bg;
 };
 
@@ -78,8 +78,8 @@ struct aui_canvas_item;
 
 void aui_run(void);
 void aui_destroy(struct aui_widget *);
-struct aui_window *aui_window_new(struct aui_windowconfig *);
-struct aui_button *aui_button_new(struct aui_widget *, struct aui_buttonconfig *);
+struct aui_window *aui_window_new(struct aui_window_config *);
+struct aui_button *aui_button_new(struct aui_widget *, struct aui_button_config *);
 struct aui_frame *aui_frame_new(struct aui_widget *);
 struct aui_canvas *aui_canvas_new(struct aui_widget *);
 int aui_place(struct aui_widget *, struct aui_placepar *);
blob - bc0fc94ea2c04cfacc6b65412d6b1279c50bc856
blob + 771779d9e1ed3c295d565aecdee4c4bb88d04ff7
--- button.c
+++ button.c
@@ -30,12 +30,12 @@ struct aui_color color[] = {
 	{ 0x3b, 0x3b, 0x3b, 0xff }, /* Press */
 };
 
-static struct aui_buttonconfig default_config = {
+static struct aui_button_config default_config = {
 	.text = NULL,
 };
 
 struct aui_button*
-aui_button_new(struct aui_widget *parent, struct aui_buttonconfig *config)
+aui_button_new(struct aui_widget *parent, struct aui_button_config *config)
 {
 	struct aui_button *button = calloc(1, sizeof(struct aui_button));
 	struct aui_widget *widget = &button->widget;
blob - 3e1fa1cf196dff055845a32f3ddb71787f9f1089
blob + d446131c88362e0184232c761d4b8c89b9c337d4
--- widget.h
+++ widget.h
@@ -74,7 +74,7 @@ struct aui_window {
 	struct aui_container con;
 	const char *title;
 	int draw_flag;
-	struct aui_windowconfig config;
+	struct aui_window_config config;
 
 	LIST_ENTRY(aui_window) entries;
 };
@@ -98,7 +98,7 @@ struct aui_canvas {
 struct aui_button {
 	struct aui_widget widget;
 	unsigned int pressed;
-	struct aui_buttonconfig config;
+	struct aui_button_config config;
 };
 
 extern struct aui_window_list wlist;
blob - c405d7fd1ddefd3eaaa7ed7f5aa873c8a97a3330
blob + ac26975ce5609037d0ecb44fe0b802fea184e180
--- window.c
+++ window.c
@@ -26,14 +26,14 @@ static struct widget_ops window_ops = {
 	window_get_min_size,
 };
 
-static struct aui_windowconfig default_config = {
+static struct aui_window_config default_config = {
 	.width =	200,
 	.height =   200,
 	.title =   "aui",
 };
 
 struct aui_window*
-aui_window_new(struct aui_windowconfig *config)
+aui_window_new(struct aui_window_config *config)
 {
 	if (driver == NULL) {
 		if (driver_open(DRIVER_TYPE_X11) == -1) {