diff --git a/src/complete-window.lisp b/src/complete-window.lisp
index 075c3d4..ec7663e 100644
--- a/src/complete-window.lisp
+++ b/src/complete-window.lisp
@@ -62,7 +62,7 @@
 
 (defun init ()
   "Initialize a complete window"
-  (let* ((low-level-window  (make-croatoan-window :draw-border t))
+  (let* ((low-level-window  (make-croatoan-window :border t))
          (high-level-window (make-instance 'complete-window
                                            :croatoan-window low-level-window)))
     (refresh-config high-level-window)
diff --git a/src/keybindings-window.lisp b/src/keybindings-window.lisp
index 72c92ee..e0b47ad 100644
--- a/src/keybindings-window.lisp
+++ b/src/keybindings-window.lisp
@@ -137,7 +137,7 @@ if tree is nil set the slot `keybindings-tree' to `tree'.
 
 (defun init ()
   "Initialize the window"
-  (let* ((low-level-window  (make-croatoan-window :draw-border t))
+  (let* ((low-level-window  (make-croatoan-window :border t))
          (high-level-window (make-instance 'keybindings-window
                                            :key-config      swconf:+key-keybindings-window+
                                            :croatoan-window low-level-window)))
diff --git a/src/notify-window.lisp b/src/notify-window.lisp
index ee9885b..63b17aa 100644
--- a/src/notify-window.lisp
+++ b/src/notify-window.lisp
@@ -84,7 +84,7 @@
   window)
 
 (defun make-notification-window (message life &key (pending 0) (hidep nil) (notify-error nil))
-  (let* ((low-level-window  (make-croatoan-window :draw-border t))
+  (let* ((low-level-window  (make-croatoan-window :border t))
          (high-level-window (make-instance 'notify-window
                                            :life            life
                                            :pending         pending
diff --git a/src/windows.lisp b/src/windows.lisp
index cbb9ac7..f3a996e 100644
--- a/src/windows.lisp
+++ b/src/windows.lisp
@@ -461,7 +461,7 @@ list of strings (the text lines)."
                                             :width                (min (+ max-line-size 4)
                                                                        (- (win-width parent)
                                                                           4))
-                                            :draw-border          t
+                                            :border               t
                                             :enable-function-keys t
                                             :name                 title
                                             :title                t
@@ -549,7 +549,7 @@ insetred by the user"
                                             :height         window-height
                                             :position       window-position
                                             :insert-mode    t
-                                            :draw-border    t
+                                            :border         t
                                             :elements       (list field
                                                                   button-accept
                                                                   button-cancel)
@@ -600,7 +600,7 @@ insetred by the user"
                                             :items                options
                                             :position             window-position
                                             :title                title
-                                            :draw-border          t
+                                            :border               t
                                             :input-blocking       t
                                             :enable-function-keys t
                                             :menu-type            :checklist