diff --git a/lib/facter/java_version.rb b/lib/facter/java_version.rb
index 1c427a8..a9d9c18 100644
--- a/lib/facter/java_version.rb
+++ b/lib/facter/java_version.rb
@@ -1,46 +1,46 @@
 # frozen_string_literal: true
 
 # Fact: java_version
 #
 # Purpose: get full java version string
 #
 # Resolution:
 #   Tests for presence of java, returns nil if not present
 #   returns output of "java -version" and splits on '"'
 #
 # Caveats:
 #   none
 #
 # Notes:
 #   None
 Facter.add(:java_version) do
   # the OS-specific overrides need to be able to return nil,
   # to indicate "no java available". Usually returning nil
   # would mean that facter falls back to a lower priority
   # resolution, which would then trigger MODULES-2637. To
   # avoid that, we confine the "default" here to not run
   # on those OS.
   # Additionally, facter versions prior to 2.0.1 only support
   # positive matches, so this needs to be done manually in setcode.
   setcode do
-    unless ['darwin'].include? Facter.value(:operatingsystem).downcase
+    unless ['darwin'].include? Facter.value(:kernel).downcase
       version = nil
       if Facter::Util::Resolution.which('java')
         Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = Regexp.last_match(1) if %r{^.+ version \"(.+)\"} =~ line }
       end
       version
     end
   end
 end
 
 Facter.add(:java_version) do
-  confine operatingsystem: 'Darwin'
+  confine kernel: 'Darwin'
   has_weight 100
   setcode do
     unless Facter::Util::Resolution.exec('/usr/libexec/java_home --failfast 2>&1').include?('Unable to find any JVMs matching version')
       version = nil
       Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = Regexp.last_match(1) if %r{^.+ version \"(.+)\"} =~ line }
       version
     end
   end
 end
diff --git a/spec/unit/facter/java_version_spec.rb b/spec/unit/facter/java_version_spec.rb
index bb4b167..2f31f6b 100644
--- a/spec/unit/facter/java_version_spec.rb
+++ b/spec/unit/facter/java_version_spec.rb
@@ -1,95 +1,95 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
 
 openjdk_7_output = "Picked up JAVA_TOOL_OPTIONS: -Djava.net.preferIPv4Stack=true\n"\
                    "openjdk version \"1.7.0_71\"\n"\
                    "OpenJDK Runtime Environment (build 1.7.0_71-b14)\n"\
                    "OpenJDK 64-Bit Server VM (build 24.71-b01, mixed mode)\n"
 
 jdk_7_hotspot_output = "Picked up JAVA_TOOL_OPTIONS: -Djava.net.preferIPv4Stack=true\n"\
                        "java version \"1.7.0_71\"\n"\
                        "Java(TM) SE Runtime Environment (build 1.7.0_71-b14)\n"\
                        "Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)\n"
 
 describe 'java_version' do
   before(:each) do
     Facter.clear
   end
 
   context 'when java present, returns java version' do
     context 'on OpenBSD', with_env: true do
       before(:each) do
         allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('OpenBSD')
       end
       let(:facts) { { operatingsystem: 'OpenBSD' } }
 
       it do
         expect(Facter::Util::Resolution).to receive(:which).with('java').and_return('/usr/local/jdk-1.7.0/jre/bin/java')
         expect(Facter::Util::Resolution).to receive(:exec).with('java -Xmx12m -version 2>&1').and_return(openjdk_7_output)
         expect(Facter.value(:java_version)).to eq('1.7.0_71')
       end
     end
     context 'when on Darwin' do
       before(:each) do
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Darwin')
+        allow(Facter.fact(:kernel)).to receive(:value).and_return('Darwin')
       end
-      let(:facts) { { operatingsystem: 'Darwin' } }
+      let(:facts) { { kernel: 'Darwin' } }
 
       it do
         expect(Facter::Util::Resolution).to receive(:exec).with('/usr/libexec/java_home --failfast 2>&1').and_return('/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home')
         expect(Facter::Util::Resolution).to receive(:exec).with('java -Xmx12m -version 2>&1').and_return(jdk_7_hotspot_output)
         expect(Facter.value(:java_version)).to eql '1.7.0_71'
       end
     end
     context 'when on other systems' do
       before(:each) do
         allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('MyOS')
       end
       let(:facts) { { operatingsystem: 'MyOS' } }
 
       it do
         expect(Facter::Util::Resolution).to receive(:which).with('java').and_return('/path/to/java')
         expect(Facter::Util::Resolution).to receive(:exec).with('java -Xmx12m -version 2>&1').and_return(jdk_7_hotspot_output)
         expect(Facter.value(:java_version)).to eq('1.7.0_71')
       end
     end
   end
 
   context 'when java not present, returns nil' do
     context 'on OpenBSD', with_env: true do
       before(:each) do
         allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('OpenBSD')
       end
       let(:facts) { { operatingsystem: 'OpenBSD' } }
 
       it do
         allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls
         allow(Facter::Util::Resolution).to receive(:which).and_return(nil)
         expect(Facter.value(:java_version)).to be_nil
       end
     end
     context 'when on Darwin' do
       before(:each) do
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Darwin')
+        allow(Facter.fact(:kernel)).to receive(:value).and_return('Darwin')
       end
-      let(:facts) { { operatingsystem: 'Darwin' } }
+      let(:facts) { { kernel: 'Darwin' } }
 
       it do
         expect(Facter::Util::Resolution).to receive(:exec).with('/usr/libexec/java_home --failfast 2>&1').at_least(1).and_return('Unable to find any JVMs matching version "(null)".')
         expect(Facter.value(:java_version)).to be_nil
       end
     end
     context 'when on other systems' do
       before(:each) do
         allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('MyOS')
       end
       let(:facts) { { operatingsystem: 'MyOS' } }
 
       it do
         expect(Facter::Util::Resolution).to receive(:which).at_least(1).with('java').and_return(false)
         expect(Facter.value(:java_version)).to be_nil
       end
     end
   end
 end