diff --git a/source/Launchpad-Commands-Tests/LaunchpadRootCommandTest.class.st b/source/Launchpad-Commands-Tests/LaunchpadRootCommandTest.class.st
index b7771b3..7b1a749 100644
--- a/source/Launchpad-Commands-Tests/LaunchpadRootCommandTest.class.st
+++ b/source/Launchpad-Commands-Tests/LaunchpadRootCommandTest.class.st
@@ -130,8 +130,8 @@ LaunchpadRootCommandTest >> handle: arguments onExitDo: aBlock [
 { #category : #private }
 LaunchpadRootCommandTest >> set: environmentVariableName to: value during: aBlock [
 
-	OSPlatform current environment at: environmentVariableName put: value.
-	aBlock ensure: [ OSPlatform current environment removeKey: environmentVariableName ]
+	LanguagePlatform current os environment at: environmentVariableName put: value.
+	aBlock ensure: [ LanguagePlatform current os environment removeKey: environmentVariableName ]
 ]
 
 { #category : #running }
diff --git a/source/Launchpad-Configuration-Tests/ConfigurationFromEnvironmentProviderTest.class.st b/source/Launchpad-Configuration-Tests/ConfigurationFromEnvironmentProviderTest.class.st
index 1ffe264..f1ae6d4 100644
--- a/source/Launchpad-Configuration-Tests/ConfigurationFromEnvironmentProviderTest.class.st
+++ b/source/Launchpad-Configuration-Tests/ConfigurationFromEnvironmentProviderTest.class.st
@@ -10,8 +10,8 @@ Class {
 { #category : #private }
 ConfigurationFromEnvironmentProviderTest >> set: environmentVariableName to: value during: aBlock [
 
-	OSPlatform current environment at: environmentVariableName put: value.
-	aBlock ensure: [ OSPlatform current environment removeKey: environmentVariableName ]
+	LanguagePlatform current os environment at: environmentVariableName put: value.
+	aBlock ensure: [ LanguagePlatform current os environment removeKey: environmentVariableName ]
 ]
 
 { #category : #tests }
diff --git a/source/Launchpad-Configuration/ConfigurationFromEnvironmentProvider.class.st b/source/Launchpad-Configuration/ConfigurationFromEnvironmentProvider.class.st
index ee4acba..ed45bd1 100644
--- a/source/Launchpad-Configuration/ConfigurationFromEnvironmentProvider.class.st
+++ b/source/Launchpad-Configuration/ConfigurationFromEnvironmentProvider.class.st
@@ -34,7 +34,7 @@ ConfigurationFromEnvironmentProvider >> reloadConfiguration [
 { #category : #resolving }
 ConfigurationFromEnvironmentProvider >> valueFor: aConfigurationParameter ifFound: aPresentBlock ifNone: aFailBlock [
 
-	^ OSPlatform current
+	^ LanguagePlatform current os
 		  environmentAt: aConfigurationParameter environmentVariableName
 		  ifPresent: aPresentBlock
 		  ifAbsent: [