diff --git a/launcher/embeddedlauncher.cpp b/launcher/embeddedlauncher.cpp
--- a/launcher/embeddedlauncher.cpp
+++ b/launcher/embeddedlauncher.cpp
@@ -46,7 +46,6 @@
 #include "board.h"
 
 #include <util/kdevstringhandler.h>
-#include <util/environmentgrouplist.h>
 #include <project/projectitemlineedit.h>
 #include "projecttargetscombobox.h"
 
diff --git a/launcher/executeplugin.h b/launcher/executeplugin.h
--- a/launcher/executeplugin.h
+++ b/launcher/executeplugin.h
@@ -45,7 +45,7 @@
     static QString executableEntry;
     static QString argumentsEntry;
     static QString isExecutableEntry;
-    static QString environmentGroupEntry;
+    static QString environmentProfileEntry;
     static QString useTerminalEntry;
     static QString commandEntry;
     static QString userIdToRunEntry;
@@ -66,7 +66,7 @@
     QStringList arguments(KDevelop::ILaunchConfiguration*, QString& err) const override;
     QUrl workingDirectory(KDevelop::ILaunchConfiguration*) const override;
     KJob* dependencyJob(KDevelop::ILaunchConfiguration*) const override;
-    QString environmentGroup(KDevelop::ILaunchConfiguration*) const override;
+	QString environmentProfileName(KDevelop::ILaunchConfiguration* cfg) const override;
     bool useTerminal(KDevelop::ILaunchConfiguration*) const override;
     QString terminal(KDevelop::ILaunchConfiguration*) const override;
     QString nativeAppConfigTypeId() const override;
diff --git a/launcher/executeplugin.cpp b/launcher/executeplugin.cpp
--- a/launcher/executeplugin.cpp
+++ b/launcher/executeplugin.cpp
@@ -38,7 +38,6 @@
 #include <interfaces/ilaunchconfiguration.h>
 #include <interfaces/iprojectcontroller.h>
 #include <interfaces/iuicontroller.h>
-#include <util/environmentgrouplist.h>
 
 #include "debug.h"
 #include "toolkit.h"
@@ -52,7 +51,7 @@
 QString ExecutePlugin::executableEntry = QStringLiteral("Executable");
 QString ExecutePlugin::argumentsEntry = QStringLiteral("Arguments");
 QString ExecutePlugin::isExecutableEntry = QStringLiteral("isExecutable");
-QString ExecutePlugin::environmentGroupEntry = QStringLiteral("EnvironmentGroup");
+QString ExecutePlugin::environmentProfileEntry = QStringLiteral("EnvironmentGroup");
 QString ExecutePlugin::useTerminalEntry = QStringLiteral("Use External Terminal");
 QString ExecutePlugin::commandEntry = QStringLiteral("Command");
 QString ExecutePlugin::boardEntry = QStringLiteral("Board Index");
@@ -187,14 +186,14 @@
 }
 
 
-QString ExecutePlugin::environmentGroup(KDevelop::ILaunchConfiguration* cfg) const
+QString ExecutePlugin::environmentProfileName(KDevelop::ILaunchConfiguration* cfg) const
 {
     if (!cfg)
     {
         return QString();
     }
 
-    return cfg->config().readEntry(ExecutePlugin::environmentGroupEntry, "");
+    return cfg->config().readEntry(ExecutePlugin::environmentProfileEntry, "");
 }
 
 
diff --git a/launcher/launcherjob.cpp b/launcher/launcherjob.cpp
--- a/launcher/launcherjob.cpp
+++ b/launcher/launcherjob.cpp
@@ -35,7 +35,7 @@
 #include <interfaces/ilaunchconfiguration.h>
 #include <interfaces/iruncontroller.h>
 #include <outputview/outputmodel.h>
-#include <util/environmentgrouplist.h>
+#include <util/environmentprofilelist.h>
 
 #include <interfaces/icore.h>
 #include <interfaces/isession.h>
@@ -65,9 +65,9 @@
     IExecutePlugin* iface = KDevelop::ICore::self()->pluginController()->pluginForExtension(QStringLiteral("org.kdevelop.IExecutePlugin"), QStringLiteral("kdevembedded-launcher"))->extension<IExecutePlugin>();
     Q_ASSERT(iface);
 
-    KDevelop::EnvironmentGroupList l(KSharedConfig::openConfig());
-    QString envgrp = iface->environmentGroup(cfg);
-    qCDebug(LaMsg) << "LauncherJob::LauncherJob envgrp" << envgrp;
+    KDevelop::EnvironmentProfileList l(KSharedConfig::openConfig());
+    QString envProfileName = iface->environmentProfileName(cfg);
+    qCDebug(LaMsg) << "LauncherJob::LauncherJob envProfileName" << envProfileName;
 
     QString err;
     QUrl executable = iface->executable(cfg, err);
@@ -80,14 +80,14 @@
         return;
     }
 
-    if (envgrp.isEmpty())
+    if (envProfileName.isEmpty())
     {
-        qWarning() << "Launch Configuration:" << cfg->name() << "no environment group specified, looks like a broken "
+        qWarning() << "Launch Configuration:" << cfg->name() << "no environment profile specified, looks like a broken "
                    "configuration, please check run configuration" << cfg->name()
-                   << "Using default environment group.";
-        envgrp = l.defaultGroup();
+                   << "Using default environment profile.";
+        envProfileName = l.defaultProfileName();
     }
-    setEnvironmentProfile(envgrp);
+    setEnvironmentProfile(envProfileName);
 
     QStringList arguments = iface->arguments(cfg, err);
     qCDebug(LaMsg) << "LauncherJob::LauncherJob arguments" << arguments;