diff --git a/dbus-sdr/meson.build b/dbus-sdr/meson.build
index 37b5669..a937485 100644
--- a/dbus-sdr/meson.build
+++ b/dbus-sdr/meson.build
@@ -9,7 +9,7 @@
 
 hybrid_src = []
 
-if not get_option('hybrid-sensors').disabled()
+if get_option('hybrid-sensors').allowed()
     hybrid_src = [
         'sensorhandler.cpp',
         'sensordatahandler.cpp',
@@ -19,7 +19,7 @@
 endif
 
 sensorsoem_src = []
-if not get_option('sensors-oem').disabled()
+if get_option('sensors-oem').allowed()
     sensorsoem_src = ['dbus-sdr/sensorcommands_oem.cpp']
 endif
 
diff --git a/meson.build b/meson.build
index 341c72f..a427bdb 100644
--- a/meson.build
+++ b/meson.build
@@ -24,7 +24,7 @@
 )
 
 # Soft Power off related.
-if not get_option('softoff').disabled()
+if get_option('softoff').allowed()
     conf_data.set_quoted('SOFTOFF_BUSNAME', get_option('softoff-busname'))
     conf_data.set_quoted('SOFTOFF_OBJPATH', get_option('softoff-objpath'))
     conf_data.set(
@@ -86,7 +86,7 @@
     language: 'cpp',
 )
 
-if not get_option('get-dbus-active-software').disabled()
+if get_option('get-dbus-active-software').allowed()
     add_project_arguments(
         cpp.get_supported_arguments(['-DGET_DBUS_ACTIVE_SOFTWARE']),
         language: 'cpp',
@@ -177,13 +177,13 @@
 subdir('user_channel')
 subdir('scripts')
 
-if not get_option('softoff').disabled()
+if get_option('softoff').allowed()
     subdir('xyz/openbmc_project/Ipmi/Internal/SoftPowerOff')
     subdir('softoff')
 endif
 
 # whitelist
-if not get_option('ipmi-whitelist').disabled()
+if get_option('ipmi-whitelist').allowed()
     generate_whitelist_script = files('generate_whitelist_create.sh')
 
     whitelist_conf = get_option('whitelist-conf')
@@ -256,7 +256,7 @@
 ]
 
 transportoem_src = []
-if not get_option('transport-oem').disabled()
+if get_option('transport-oem').allowed()
     transportoem_src = ['transporthandler_oem.cpp']
 endif
 
@@ -332,7 +332,7 @@
 # Dynamic Sensor Stack
 subdir('dbus-sdr')
 
-if not get_option('dynamic-sensors').disabled() or not get_option('tests').disabled()
+if get_option('dynamic-sensors').disabled() or not get_option('tests').allowed()
     library(
         'dynamiccmds',
         dbus_sdr_src,
@@ -345,7 +345,7 @@
     )
 endif
 
-if not get_option('tests').disabled()
+if get_option('tests').allowed()
     subdir('test')
 endif
 
diff --git a/user_channel/meson.build b/user_channel/meson.build
index b47b27c..701c86a 100644
--- a/user_channel/meson.build
+++ b/user_channel/meson.build
@@ -37,7 +37,7 @@
     description: 'libchannellayer',
 )
 
-if not get_option('libuserlayer').disabled()
+if get_option('libuserlayer').allowed()
     userlayer_pre = declare_dependency(
         include_directories: [root_inc, user_channel_inc],
         dependencies: [