diff --git a/operating-systems/buer.scm b/operating-systems/buer.scm
index e742914..04440f0 100644
--- a/operating-systems/buer.scm
+++ b/operating-systems/buer.scm
@@ -35,9 +35,7 @@
   #|S|# #:use-module (gnu services sysctl)
 
   #|GNU system|#
-  #|•|# #:use-module ((gnu system)
-                      #:select (operating-system)
-                      #:prefix gnu:)
+  #|•|# #:use-module (gnu system)
   #|A|# #:use-module (gnu system accounts)
   #|F|# #:use-module (gnu system file-systems)
   #|K|# #:use-module (gnu system keyboard)
@@ -49,8 +47,7 @@
 
   #|Home environments|#
   #|R|# #:use-module ((home-environments radio)
-                      #:select (home-environment)
-                      #:renamer (const 'home-environment:radio))
+                      #:prefix home-environment:)
 
   #|Radix|#
   #|A|# #:use-module (radix artwork)
@@ -90,10 +87,10 @@
   #|SRFIs|#
   #|1|# #:use-module (srfi srfi-1)
 
-  #:export (operating-system))
+  #:export (buer))
 
-(define operating-system
-  (gnu:operating-system
+(define buer
+  (operating-system
    (host-name "buer")
    (timezone "America/Sao_Paulo")
    (locale "en_US.utf8")
@@ -324,5 +321,4 @@
           #|Base services|#
           (service urandom-seed-service-type)
           (service nscd-service-type)))))
-
-operating-system
+buer