Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision f173404146b4afb7af15c0a9783566536346757a)
+++ HelenOS.config	(revision 15b592bf3a32ad36c508fb180456f4ef8486c9de)
@@ -528,5 +528,5 @@
 ! CONFIG_OPTIMIZE_FOR_SIZE (n/y)
 
-% Bare boned build with essential binaries only 
-! CONFIG_BARE_BONED (n/y)
-
+% Barebone build with essential binaries only 
+! CONFIG_BAREBONE (n/y)
+
Index: boot/Makefile.common
===================================================================
--- boot/Makefile.common	(revision f173404146b4afb7af15c0a9783566536346757a)
+++ boot/Makefile.common	(revision 15b592bf3a32ad36c508fb180456f4ef8486c9de)
@@ -134,5 +134,5 @@
 	$(USPACE_PATH)/app/top/top
 
-ifneq ($(CONFIG_BARE_BONED),y)
+ifneq ($(CONFIG_BAREBONE),y)
 NET_CFG = \
 	$(USPACE_PATH)/srv/net/cfg/general \
@@ -152,5 +152,5 @@
 -include arch/$(BARCH)/Makefile.inc
 
-ifeq ($(CONFIG_BARE_BONED),y)
+ifeq ($(CONFIG_BAREBONE),y)
 RD_SRVS = $(RD_SRVS_ESSENTIAL)
 RD_APPS = $(RD_APPS_ESSENTIAL)
Index: defaults/sparc64/serengeti/Makefile.config
===================================================================
--- defaults/sparc64/serengeti/Makefile.config	(revision f173404146b4afb7af15c0a9783566536346757a)
+++ defaults/sparc64/serengeti/Makefile.config	(revision 15b592bf3a32ad36c508fb180456f4ef8486c9de)
@@ -9,3 +9,3 @@
 CONFIG_STRIP_BINARIES = y
 CONFIG_OPTIMIZE_FOR_SIZE = y
-CONFIG_BARE_BONED = y
+CONFIG_BAREBONE = y