diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
index 39e74a76db13c4542ae77175b2186ee7c1ec8bdd..066ab2cf7b2d631814d8405af35fa0f31bff6f7a 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
@@ -408,10 +408,10 @@ void CMakeRunPage::initializePage()
         foreach (ProjectExplorer::ToolChain *tc, tcs) {
             ProjectExplorer::Abi targetAbi = tc->targetAbi();
             QVariant tcVariant = qVariantFromValue(static_cast<void *>(tc));
-            if (targetAbi.os() == ProjectExplorer::Abi::Windows) {
-                if (targetAbi.osFlavor() == ProjectExplorer::Abi::Windows_msvc)
+            if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) {
+                if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvcFlavor)
                     m_generatorComboBox->addItem(tr("NMake Generator (%1)").arg(tc->displayName()), tcVariant);
-                else if (targetAbi.osFlavor() == ProjectExplorer::Abi::Windows_msys)
+                else if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor)
                     m_generatorComboBox->addItem(tr("MinGW Generator (%1)").arg(tc->displayName()), tcVariant);
                 else
                     continue;
@@ -449,8 +449,8 @@ void CMakeRunPage::runCMake()
     CMakeManager *cmakeManager = m_cmakeWizard->cmakeManager();
 
     QString generator = QLatin1String("-GCodeBlocks - Unix Makefiles");
-    if (tc->targetAbi().os() == ProjectExplorer::Abi::Windows) {
-        if (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::Windows_msvc)
+    if (tc->targetAbi().os() == ProjectExplorer::Abi::WindowsOS) {
+        if (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::WindowsMsvcFlavor)
             generator = QLatin1String("-GCodeBlocks - NMake Makefiles");
         else
             generator = QLatin1String("-GCodeBlocks - MinGW Makefiles");
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index a9e836bc9b3f83cfe62f784b6551b73ba11d3475..1538dc191c840e07c2408b1048dc9fd4ec3e02d0 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -299,7 +299,7 @@ static inline bool validMode(DebuggerStartMode sm)
     return true;
 }
 
-static inline QString msgCdbDisabled(const ProjectExplorer::Abi &abi)
+static inline QString msgCdbDisabled(const Abi &abi)
 {
     return CdbEngine::tr("The CDB debug engine required for %1 is currently disabled.").
             arg(abi.toString());
@@ -337,11 +337,11 @@ bool isCdbEngineEnabled()
 #endif
 }
 
-ConfigurationCheck checkCdbConfiguration(const ProjectExplorer::Abi &abi)
+ConfigurationCheck checkCdbConfiguration(const Abi &abi)
 {
     ConfigurationCheck check;
-    if (abi.binaryFormat() == ProjectExplorer::Abi::Format_PE
-            && abi.osFlavor() != ProjectExplorer::Abi::Windows_msys) {
+    if (abi.binaryFormat() == Abi::PEFormat
+            && abi.osFlavor() != Abi::WindowsMSysFlavor) {
         if (!isCdbEngineEnabled()) {
             check.errorMessage = msgCdbDisabled(abi);
             check.settingsPage = CdbOptionsPage::settingsId();
@@ -637,11 +637,11 @@ bool CdbEngine::launchCDB(const DebuggerStartParameters &sp, QString *errorMessa
     // Determine binary (force MSVC), extension lib name and path to use
     // The extension is passed as relative name with the path variable set
     //(does not work with absolute path names)
-    ProjectExplorer::Abi abi = sp.toolChainAbi;
-    if (abi.osFlavor() == ProjectExplorer::Abi::UNKNOWN_OSFLAVOUR || abi.osFlavor() == ProjectExplorer::Abi::Windows_msys)
-        abi = ProjectExplorer::Abi(abi.architecture(), abi.os(),
-                                   ProjectExplorer::Abi::Windows_msvc,
-                                   abi.binaryFormat(), abi.wordWidth());
+    Abi abi = sp.toolChainAbi;
+    if (abi.osFlavor() == Abi::UnknownFlavor
+            || abi.osFlavor() == Abi::WindowsMSysFlavor)
+        abi = Abi(abi.architecture(), abi.os(), Abi::WindowsMsvcFlavor,
+                  abi.binaryFormat(), abi.wordWidth());
     const QString executable = debuggerCore()->debuggerForAbi(abi);
     if (executable.isEmpty()) {
         *errorMessage = tr("There is no CDB executable specified.");
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index ef960c8910c4e73f961758797766512d05b2e3eb..e9e4e7812dab42d04801e2bc80deaebded5d4e2d 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1354,7 +1354,7 @@ void DebuggerPluginPrivate::startExternalApplication()
     // Fixme: 1 of 3 testing hacks.
     if (sp.processArgs.startsWith(__("@tcf@ ")) || sp.processArgs.startsWith(__("@sym@ ")))
         // Set up an ARM Symbian Abi
-        sp.toolChainAbi = Abi(Abi::ARM, Abi::Symbian, Abi::Symbian_device, Abi::Format_ELF, false);
+        sp.toolChainAbi = Abi(Abi::ArmArchitecture, Abi::SymbianOS, Abi::SymbianDeviceFlavor, Abi::ElfFormat, false);
 
     if (dlg.breakAtMain()) {
 #ifdef Q_OS_WIN
@@ -1438,9 +1438,9 @@ void DebuggerPluginPrivate::startRemoteCdbSession()
     DebuggerStartParameters sp;
     Abi hostAbi = Abi::hostAbi();
     sp.toolChainAbi = ProjectExplorer::Abi(hostAbi.architecture(),
-                                           ProjectExplorer::Abi::Windows,
-                                           ProjectExplorer::Abi::Windows_msvc,
-                                           ProjectExplorer::Abi::Format_PE,
+                                           ProjectExplorer::Abi::WindowsOS,
+                                           ProjectExplorer::Abi::WindowsMsvcFlavor,
+                                           ProjectExplorer::Abi::PEFormat,
                                            true);
     sp.startMode = AttachToRemote;
     StartRemoteCdbDialog dlg(mainWindow());
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index babc9315ee5a184b9c2e0d614eb437140af8ea08..ecf74e14a2a995aa9b2ca539f7aa306fadad08f7 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -167,9 +167,9 @@ DebuggerEngineType DebuggerRunControlPrivate::engineForExecutable
     // executables.
     Abi hostAbi = Abi::hostAbi();
     ConfigurationCheck check = checkDebugConfiguration(Abi(hostAbi.architecture(),
-                                                           Abi::Windows,
+                                                           Abi::WindowsOS,
                                                            hostAbi.osFlavor(),
-                                                           Abi::Format_PE,
+                                                           Abi::PEFormat,
                                                            hostAbi.wordWidth()));
     if (!check) {
         m_errorMessage = check.errorMessage;
@@ -224,16 +224,16 @@ DebuggerEngineType DebuggerRunControlPrivate::engineForMode
 static DebuggerEngineType engineForToolChain(const Abi &toolChain)
 {
     switch (toolChain.binaryFormat()) {
-    case Abi::Format_ELF:
-    case Abi::Format_Mach_O:
+    case Abi::ElfFormat:
+    case Abi::MachOFormat:
 #ifdef WITH_LLDB
             // lldb override
             if (Core::ICore::instance()->settings()->value("LLDB/enabled").toBool())
                 return LldbEngineType;
 #endif
             return GdbEngineType;
-   case Abi::Format_PE:
-        if (toolChain.osFlavor() == Abi::Windows_msys)
+   case Abi::PEFormat:
+        if (toolChain.osFlavor() == Abi::WindowsMSysFlavor)
             return GdbEngineType;
         return CdbEngineType;
     default:
@@ -385,9 +385,9 @@ ConfigurationCheck checkDebugConfiguration(const Abi &abi)
     if (!(debuggerCore()->activeLanguages() & CppLanguage))
         return result;
 
-    if (abi.binaryFormat() == Abi::Format_ELF ||
-            abi.binaryFormat() == Abi::Format_Mach_O ||
-            (abi.binaryFormat() == Abi::Format_PE && abi.osFlavor() == Abi::Windows_msys)) {
+    if (abi.binaryFormat() == Abi::ElfFormat ||
+            abi.binaryFormat() == Abi::MachOFormat ||
+            (abi.binaryFormat() == Abi::PEFormat && abi.osFlavor() == Abi::WindowsMSysFlavor)) {
         if (debuggerCore()->debuggerForAbi(abi).isEmpty()) {
             result.errorMessage = msgNoBinaryForToolChain(abi);
             if (!result.errorMessage.isEmpty())
@@ -395,8 +395,8 @@ ConfigurationCheck checkDebugConfiguration(const Abi &abi)
             result.errorMessage += QLatin1Char(' ') + msgEngineNotAvailable("Gdb");
             result.settingsPage = _(Constants::DEBUGGER_COMMON_SETTINGS_ID);
         }
-    } else if (abi.binaryFormat() == Abi::Format_PE
-                && abi.osFlavor() != Abi::Windows_msys) {
+    } else if (abi.binaryFormat() == Abi::PEFormat
+                && abi.osFlavor() != Abi::WindowsMSysFlavor) {
         result = checkCdbConfiguration(abi);
         if (!result) {
             if (!result.errorMessage.isEmpty())
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 33efe94dfc917fb8fa003507c95e8379cdc56945..c60167f0742adaaf5f2298b494b5ceb2058d9aba 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -102,6 +102,8 @@
 #endif
 #include <ctype.h>
 
+using namespace ProjectExplorer;
+
 namespace Debugger {
 namespace Internal {
 
@@ -1805,7 +1807,7 @@ QString msgNoBinaryForToolChain(const ProjectExplorer::Abi &tc)
 AbstractGdbAdapter *GdbEngine::createAdapter()
 {
     const DebuggerStartParameters &sp = startParameters();
-    if (sp.toolChainAbi.os() == ProjectExplorer::Abi::Symbian) {
+    if (sp.toolChainAbi.os() == ProjectExplorer::Abi::SymbianOS) {
         // FIXME: 1 of 3 testing hacks.
         if (sp.debugClient == DebuggerStartParameters::DebugClientCoda)
             return new CodaGdbAdapter(this);
@@ -4208,13 +4210,14 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &gdb,
     const DebuggerStartParameters &sp = startParameters();
     m_gdb = QString::fromLocal8Bit(qgetenv("QTC_DEBUGGER_PATH"));
     if (m_gdb.isEmpty() && sp.startMode != StartRemoteGdb) {
-        // We want the MinGW gdb also in case we got started using some compatible ABI.
-        ProjectExplorer::Abi abi = startParameters().toolChainAbi;
-        if (abi.os() == ProjectExplorer::Abi::Windows) {
-            if (abi.osFlavor() == ProjectExplorer::Abi::UNKNOWN_OSFLAVOUR || abi.osFlavor() == ProjectExplorer::Abi::Windows_msvc)
-                abi = ProjectExplorer::Abi(abi.architecture(), abi.os(),
-                                           ProjectExplorer::Abi::Windows_msys,
-                                           abi.binaryFormat(), abi.wordWidth());
+        // We want the MinGW gdb also in case we got started using
+        // some compatible ABI.
+        Abi abi = startParameters().toolChainAbi;
+        if (abi.os() == Abi::WindowsOS) {
+            if (abi.osFlavor() == Abi::UnknownFlavor
+                    || abi.osFlavor() == Abi::WindowsMsvcFlavor)
+                abi = Abi(abi.architecture(), abi.os(), Abi::WindowsMSysFlavor,
+                          abi.binaryFormat(), abi.wordWidth());
         }
         m_gdb = debuggerCore()->debuggerForAbi(abi);
     }
diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
index fcef41aca1e290c485ff92db192f6f34b5deeb40..49b13c54db4443927b6a5843e49466c5e1212301 100644
--- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
+++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
@@ -77,9 +77,9 @@ RemoteGdbServerAdapter::RemoteGdbServerAdapter(GdbEngine *engine,
 
 AbstractGdbAdapter::DumperHandling RemoteGdbServerAdapter::dumperHandling() const
 {
-    if (m_abi.os() == ProjectExplorer::Abi::Symbian
-            || m_abi.os() == ProjectExplorer::Abi::Windows
-            || m_abi.binaryFormat() == ProjectExplorer::Abi::Format_ELF)
+    if (m_abi.os() == ProjectExplorer::Abi::SymbianOS
+            || m_abi.os() == ProjectExplorer::Abi::WindowsOS
+            || m_abi.binaryFormat() == ProjectExplorer::Abi::ElfFormat)
         return DumperLoadedByGdb;
     return DumperLoadedByGdbPreload;
 }
diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp
index 3a02abfc390f42a8ec1324308de0141999b2bf12..f6b934abdff7d787ce32fc6bd572f4d1dc26fc57 100644
--- a/src/plugins/projectexplorer/abi.cpp
+++ b/src/plugins/projectexplorer/abi.cpp
@@ -42,113 +42,113 @@
 namespace ProjectExplorer {
 
 Abi::Abi(const Architecture &a, const OS &o,
-         const OSFlavour &of, const BinaryFormat &f, unsigned char w) :
+         const OSFlavor &of, const BinaryFormat &f, unsigned char w) :
     m_architecture(a), m_os(o), m_osFlavor(of), m_binaryFormat(f), m_wordWidth(w)
 {
     switch (m_os) {
-    case ProjectExplorer::Abi::UNKNOWN_OS:
-        m_osFlavor = UNKNOWN_OSFLAVOUR;
+    case ProjectExplorer::Abi::UnknownOS:
+        m_osFlavor = UnknownFlavor;
         break;
-    case ProjectExplorer::Abi::Linux:
-        if (m_osFlavor < Linux_generic || m_osFlavor > Linux_meego)
-            m_osFlavor = UNKNOWN_OSFLAVOUR;
+    case ProjectExplorer::Abi::LinuxOS:
+        if (m_osFlavor < GenericLinuxFlavor || m_osFlavor > MeegoLinuxFlavor)
+            m_osFlavor = UnknownFlavor;
         break;
-    case ProjectExplorer::Abi::Mac:
-        if (m_osFlavor < Mac_generic || m_osFlavor > Mac_generic)
-            m_osFlavor = UNKNOWN_OSFLAVOUR;
+    case ProjectExplorer::Abi::MacOS:
+        if (m_osFlavor < GenericMacFlavor || m_osFlavor > GenericMacFlavor)
+            m_osFlavor = UnknownFlavor;
         break;
-    case ProjectExplorer::Abi::Symbian:
-        if (m_osFlavor < Symbian_device || m_osFlavor > Symbian_emulator)
-            m_osFlavor = UNKNOWN_OSFLAVOUR;
+    case ProjectExplorer::Abi::SymbianOS:
+        if (m_osFlavor < SymbianDeviceFlavor || m_osFlavor > SymbianEmulatorFlavor)
+            m_osFlavor = UnknownFlavor;
         break;
-    case ProjectExplorer::Abi::UNIX:
-        if (m_osFlavor < Unix_generic || m_osFlavor > Unix_generic)
-            m_osFlavor = UNKNOWN_OSFLAVOUR;
+    case ProjectExplorer::Abi::UnixOS:
+        if (m_osFlavor < GenericUnixFlavor || m_osFlavor > GenericUnixFlavor)
+            m_osFlavor = UnknownFlavor;
         break;
-    case ProjectExplorer::Abi::Windows:
-        if (m_osFlavor < Windows_msvc || m_osFlavor > Windows_ce)
-            m_osFlavor = UNKNOWN_OSFLAVOUR;
+    case ProjectExplorer::Abi::WindowsOS:
+        if (m_osFlavor < WindowsMsvcFlavor || m_osFlavor > WindowsCEFlavor)
+            m_osFlavor = UnknownFlavor;
         break;
     }
 }
 
 Abi::Abi(const QString &abiString) :
-    m_architecture(UNKNOWN_ARCHITECTURE), m_os(UNKNOWN_OS),
-    m_osFlavor(UNKNOWN_OSFLAVOUR), m_binaryFormat(UNKNOWN_FORMAT), m_wordWidth(0)
+    m_architecture(UnknownArchitecture), m_os(UnknownOS),
+    m_osFlavor(UnknownFlavor), m_binaryFormat(UnknownFormat), m_wordWidth(0)
 {
     QStringList abiParts = abiString.split(QLatin1Char('-'));
     if (abiParts.count() >= 1) {
         if (abiParts.at(0) == QLatin1String("unknown"))
-            m_architecture = UNKNOWN_ARCHITECTURE;
+            m_architecture = UnknownArchitecture;
         else if (abiParts.at(0) == QLatin1String("arm"))
-            m_architecture = ARM;
+            m_architecture = ArmArchitecture;
         else if (abiParts.at(0) == QLatin1String("x86"))
-            m_architecture = x86;
+            m_architecture = X86Architecture;
         else if (abiParts.at(0) == QLatin1String("mips"))
-            m_architecture = Mips;
+            m_architecture = MipsArcitecture;
         else if (abiParts.at(0) == QLatin1String("ppc"))
-            m_architecture = PowerPC;
+            m_architecture = PowerPCArchitecture;
         else if (abiParts.at(0) == QLatin1String("itanium"))
-            m_architecture = Itanium;
+            m_architecture = ItaniumArchitecture;
         else
             return;
     }
 
     if (abiParts.count() >= 2) {
         if (abiParts.at(1) == QLatin1String("unknown"))
-            m_os = UNKNOWN_OS;
+            m_os = UnknownOS;
         else if (abiParts.at(1) == QLatin1String("linux"))
-            m_os = Linux;
+            m_os = LinuxOS;
         else if (abiParts.at(1) == QLatin1String("macos"))
-            m_os = Mac;
+            m_os = MacOS;
         else if (abiParts.at(1) == QLatin1String("symbian"))
-            m_os = Symbian;
+            m_os = SymbianOS;
         else if (abiParts.at(1) == QLatin1String("unix"))
-            m_os = UNIX;
+            m_os = UnixOS;
         else if (abiParts.at(1) == QLatin1String("windows"))
-            m_os = Windows;
+            m_os = WindowsOS;
         else
             return;
     }
 
     if (abiParts.count() >= 3) {
         if (abiParts.at(2) == QLatin1String("unknown"))
-            m_osFlavor = UNKNOWN_OSFLAVOUR;
-        else if (abiParts.at(2) == QLatin1String("generic") && m_os == Linux)
-            m_osFlavor = Linux_generic;
-        else if (abiParts.at(2) == QLatin1String("maemo") && m_os == Linux)
-            m_osFlavor = Linux_maemo;
-        else if (abiParts.at(2) == QLatin1String("meego") && m_os == Linux)
-            m_osFlavor = Linux_meego;
-        else if (abiParts.at(2) == QLatin1String("generic") && m_os == Mac)
-            m_osFlavor = Mac_generic;
-        else if (abiParts.at(2) == QLatin1String("device") && m_os == Symbian)
-            m_osFlavor = Symbian_device;
-        else if (abiParts.at(2) == QLatin1String("emulator") && m_os == Symbian)
-            m_osFlavor = Symbian_emulator;
-        else if (abiParts.at(2) == QLatin1String("generic") && m_os == UNIX)
-            m_osFlavor = Unix_generic;
-        else if (abiParts.at(2) == QLatin1String("msvc") && m_os == Windows)
-            m_osFlavor = Windows_msvc;
-        else if (abiParts.at(2) == QLatin1String("msys") && m_os == Windows)
-            m_osFlavor = Windows_msys;
-        else if (abiParts.at(2) == QLatin1String("ce") && m_os == Windows)
-            m_osFlavor = Windows_ce;
+            m_osFlavor = UnknownFlavor;
+        else if (abiParts.at(2) == QLatin1String("generic") && m_os == LinuxOS)
+            m_osFlavor = GenericLinuxFlavor;
+        else if (abiParts.at(2) == QLatin1String("maemo") && m_os == LinuxOS)
+            m_osFlavor = MaemoLinuxFlavor;
+        else if (abiParts.at(2) == QLatin1String("meego") && m_os == LinuxOS)
+            m_osFlavor = MeegoLinuxFlavor;
+        else if (abiParts.at(2) == QLatin1String("generic") && m_os == MacOS)
+            m_osFlavor = GenericMacFlavor;
+        else if (abiParts.at(2) == QLatin1String("device") && m_os == SymbianOS)
+            m_osFlavor = SymbianDeviceFlavor;
+        else if (abiParts.at(2) == QLatin1String("emulator") && m_os == SymbianOS)
+            m_osFlavor = SymbianEmulatorFlavor;
+        else if (abiParts.at(2) == QLatin1String("generic") && m_os == UnixOS)
+            m_osFlavor = GenericUnixFlavor;
+        else if (abiParts.at(2) == QLatin1String("msvc") && m_os == WindowsOS)
+            m_osFlavor = WindowsMsvcFlavor;
+        else if (abiParts.at(2) == QLatin1String("msys") && m_os == WindowsOS)
+            m_osFlavor = WindowsMSysFlavor;
+        else if (abiParts.at(2) == QLatin1String("ce") && m_os == WindowsOS)
+            m_osFlavor = WindowsCEFlavor;
         else
             return;
     }
 
     if (abiParts.count() >= 4) {
         if (abiParts.at(3) == QLatin1String("unknown"))
-            m_binaryFormat = UNKNOWN_FORMAT;
+            m_binaryFormat = UnknownFormat;
         else if (abiParts.at(3) == QLatin1String("elf"))
-            m_binaryFormat = Format_ELF;
+            m_binaryFormat = ElfFormat;
         else if (abiParts.at(3) == QLatin1String("pe"))
-            m_binaryFormat = Format_PE;
+            m_binaryFormat = PEFormat;
         else if (abiParts.at(3) == QLatin1String("mach_o"))
-            m_binaryFormat = Format_Mach_O;
+            m_binaryFormat = MachOFormat;
         else if (abiParts.at(3) == QLatin1String("qml_rt"))
-            m_binaryFormat = Format_Runtime_QML;
+            m_binaryFormat = RuntimeQmlFormat;
         else
             return;
     }
@@ -191,36 +191,36 @@ bool Abi::operator == (const Abi &other) const
 
 bool Abi::isCompatibleWith(const Abi &other) const
 {
-    return (architecture() == other.architecture() || other.architecture() == Abi::UNKNOWN_ARCHITECTURE)
-            && (os() == other.os() || other.os() == Abi::UNKNOWN_OS)
-            && (osFlavor() == other.osFlavor() || other.osFlavor() == Abi::UNKNOWN_OSFLAVOUR)
-            && (binaryFormat() == other.binaryFormat() || other.binaryFormat() == Abi::UNKNOWN_FORMAT)
+    return (architecture() == other.architecture() || other.architecture() == Abi::UnknownArchitecture)
+            && (os() == other.os() || other.os() == Abi::UnknownOS)
+            && (osFlavor() == other.osFlavor() || other.osFlavor() == Abi::UnknownFlavor)
+            && (binaryFormat() == other.binaryFormat() || other.binaryFormat() == Abi::UnknownFormat)
             && ((wordWidth() == other.wordWidth() && wordWidth() != 0) || other.wordWidth() == 0);
 }
 
 bool Abi::isValid() const
 {
-    return m_architecture != UNKNOWN_ARCHITECTURE
-            && m_os != UNKNOWN_OS
-            && m_osFlavor != UNKNOWN_OSFLAVOUR
-            && m_binaryFormat != UNKNOWN_FORMAT
+    return m_architecture != UnknownArchitecture
+            && m_os != UnknownOS
+            && m_osFlavor != UnknownFlavor
+            && m_binaryFormat != UnknownFormat
             && m_wordWidth != 0;
 }
 
 QString Abi::toString(const Architecture &a)
 {
     switch (a) {
-    case ARM:
+    case ArmArchitecture:
         return QLatin1String("arm");
-    case x86:
+    case X86Architecture:
         return QLatin1String("x86");
-    case Mips:
+    case MipsArcitecture:
         return QLatin1String("mips");
-    case PowerPC:
+    case PowerPCArchitecture:
         return QLatin1String("ppc");
-    case Itanium:
+    case ItaniumArchitecture:
         return QLatin1String("itanium");
-    case UNKNOWN_ARCHITECTURE: // fall through!
+    case UnknownArchitecture: // fall through!
     default:
         return QLatin1String("unknown");
     }
@@ -229,48 +229,48 @@ QString Abi::toString(const Architecture &a)
 QString Abi::toString(const OS &o)
 {
     switch (o) {
-    case Linux:
+    case LinuxOS:
         return QLatin1String("linux");
-    case Mac:
+    case MacOS:
         return QLatin1String("macos");
-    case Symbian:
+    case SymbianOS:
         return QLatin1String("symbian");
-    case UNIX:
+    case UnixOS:
         return QLatin1String("unix");
-    case Windows:
+    case WindowsOS:
         return QLatin1String("windows");
-    case UNKNOWN_OS: // fall through!
+    case UnknownOS: // fall through!
     default:
         return QLatin1String("unknown");
     };
 }
 
-QString Abi::toString(const OSFlavour &of)
+QString Abi::toString(const OSFlavor &of)
 {
     switch (of) {
-    case ProjectExplorer::Abi::Linux_generic:
+    case ProjectExplorer::Abi::GenericLinuxFlavor:
         return QLatin1String("generic");
-    case ProjectExplorer::Abi::Linux_maemo:
+    case ProjectExplorer::Abi::MaemoLinuxFlavor:
         return QLatin1String("maemo");
-    case ProjectExplorer::Abi::Linux_harmattan:
+    case ProjectExplorer::Abi::HarmattanLinuxFlavor:
         return QLatin1String("harmattan");
-    case ProjectExplorer::Abi::Linux_meego:
+    case ProjectExplorer::Abi::MeegoLinuxFlavor:
         return QLatin1String("meego");
-    case ProjectExplorer::Abi::Mac_generic:
+    case ProjectExplorer::Abi::GenericMacFlavor:
         return QLatin1String("generic");
-    case ProjectExplorer::Abi::Symbian_device:
+    case ProjectExplorer::Abi::SymbianDeviceFlavor:
         return QLatin1String("device");
-    case ProjectExplorer::Abi::Symbian_emulator:
+    case ProjectExplorer::Abi::SymbianEmulatorFlavor:
         return QLatin1String("emulator");
-    case ProjectExplorer::Abi::Unix_generic:
+    case ProjectExplorer::Abi::GenericUnixFlavor:
         return QLatin1String("generic");
-    case ProjectExplorer::Abi::Windows_msvc:
+    case ProjectExplorer::Abi::WindowsMsvcFlavor:
         return QLatin1String("msvc");
-    case ProjectExplorer::Abi::Windows_msys:
+    case ProjectExplorer::Abi::WindowsMSysFlavor:
         return QLatin1String("msys");
-    case ProjectExplorer::Abi::Windows_ce:
+    case ProjectExplorer::Abi::WindowsCEFlavor:
         return QLatin1String("ce");
-    case ProjectExplorer::Abi::UNKNOWN_OSFLAVOUR: // fall throught!
+    case ProjectExplorer::Abi::UnknownFlavor: // fall throught!
     default:
         return QLatin1String("unknown");
     }
@@ -279,15 +279,15 @@ QString Abi::toString(const OSFlavour &of)
 QString Abi::toString(const BinaryFormat &bf)
 {
     switch (bf) {
-    case Format_ELF:
+    case ElfFormat:
         return QLatin1String("elf");
-    case Format_PE:
+    case PEFormat:
         return QLatin1String("pe");
-    case Format_Mach_O:
+    case MachOFormat:
         return QLatin1String("mach_o");
-    case Format_Runtime_QML:
+    case RuntimeQmlFormat:
         return QLatin1String("qml_rt");
-    case UNKNOWN_FORMAT: // fall through!
+    case UnknownFormat: // fall through!
     default:
         return QLatin1String("unknown");
     }
@@ -304,22 +304,22 @@ QString Abi::toString(int w)
 Abi Abi::hostAbi()
 {
     Architecture arch = QTC_CPU; // define set by qmake
-    OS os = UNKNOWN_OS;
-    OSFlavour subos = UNKNOWN_OSFLAVOUR;
-    BinaryFormat format = UNKNOWN_FORMAT;
+    OS os = UnknownOS;
+    OSFlavor subos = UnknownFlavor;
+    BinaryFormat format = UnknownFormat;
 
 #if defined (Q_OS_WIN)
-    os = Windows;
-    subos = Windows_msvc;
-    format = Format_PE;
+    os = WindowsOS;
+    subos = WindowsMsvcFlavor;
+    format = PEFormat;
 #elif defined (Q_OS_LINUX)
-    os = Linux;
-    subos = Linux_generic;
-    format = Format_ELF;
+    os = LinuxOS;
+    subos = GenericLinuxFlavor;
+    format = ElfFormat;
 #elif defined (Q_OS_MAC)
-    os = Mac;
-    subos = Mac_generic;
-    format = Format_Mach_O;
+    os = MacOS;
+    subos = GenericMacFlavor;
+    format = MachOFormat;
 #endif
 
     return Abi(arch, os, subos, format, QSysInfo::WordSize);
@@ -328,15 +328,15 @@ Abi Abi::hostAbi()
 static Abi macAbiForCpu(quint32 type) {
     switch (type) {
     case 7: // CPU_TYPE_X86, CPU_TYPE_I386
-        return Abi(Abi::x86, Abi::Mac, Abi::Mac_generic, Abi::Format_Mach_O, 32);
+        return Abi(Abi::X86Architecture, Abi::MacOS, Abi::GenericMacFlavor, Abi::MachOFormat, 32);
     case 0x01000000 +  7: // CPU_TYPE_X86_64
-        return Abi(Abi::x86, Abi::Mac, Abi::Mac_generic, Abi::Format_Mach_O, 64);
+        return Abi(Abi::X86Architecture, Abi::MacOS, Abi::GenericMacFlavor, Abi::MachOFormat, 64);
     case 18: // CPU_TYPE_POWERPC
-        return Abi(Abi::PowerPC, Abi::Mac, Abi::Mac_generic, Abi::Format_Mach_O, 32);
+        return Abi(Abi::PowerPCArchitecture, Abi::MacOS, Abi::GenericMacFlavor, Abi::MachOFormat, 32);
     case 0x01000000 + 18: // CPU_TYPE_POWERPC64
-        return Abi(Abi::PowerPC, Abi::Mac, Abi::Mac_generic, Abi::Format_Mach_O, 32);
+        return Abi(Abi::PowerPCArchitecture, Abi::MacOS, Abi::GenericMacFlavor, Abi::MachOFormat, 32);
     case 12: // CPU_TYPE_ARM
-        return Abi(Abi::ARM, Abi::Mac, Abi::Mac_generic, Abi::Format_Mach_O, 32);
+        return Abi(Abi::ArmArchitecture, Abi::MacOS, Abi::GenericMacFlavor, Abi::MachOFormat, 32);
     default:
         return Abi();
     }
@@ -363,22 +363,22 @@ QList<Abi> Abi::abisOfBinary(const QString &path)
         quint16 machine = (data.at(19) << 8) + data.at(18);
         switch (machine) {
         case 3: // EM_386
-            result.append(Abi(Abi::x86, Abi::Linux, Abi::Linux_generic, Abi::Format_ELF, 32));
+            result.append(Abi(Abi::X86Architecture, Abi::LinuxOS, Abi::GenericLinuxFlavor, Abi::ElfFormat, 32));
             break;
         case 8: // EM_MIPS
-            result.append(Abi(Abi::Mips, Abi::Linux, Abi::Linux_generic, Abi::Format_ELF, 32));
+            result.append(Abi(Abi::MipsArcitecture, Abi::LinuxOS, Abi::GenericLinuxFlavor, Abi::ElfFormat, 32));
             break;
         case 20: // EM_PPC
-            result.append(Abi(Abi::PowerPC, Abi::Linux, Abi::Linux_generic, Abi::Format_ELF, 32));
+            result.append(Abi(Abi::PowerPCArchitecture, Abi::LinuxOS, Abi::GenericLinuxFlavor, Abi::ElfFormat, 32));
             break;
         case 21: // EM_PPC64
-            result.append(Abi(Abi::PowerPC, Abi::Linux, Abi::Linux_generic, Abi::Format_ELF, 64));
+            result.append(Abi(Abi::PowerPCArchitecture, Abi::LinuxOS, Abi::GenericLinuxFlavor, Abi::ElfFormat, 64));
             break;
         case 62: // EM_X86_64
-            result.append(Abi(Abi::x86, Abi::Linux, Abi::Linux_generic, Abi::Format_ELF, 64));
+            result.append(Abi(Abi::X86Architecture, Abi::LinuxOS, Abi::GenericLinuxFlavor, Abi::ElfFormat, 64));
             break;
         case 50: // EM_IA_64
-            result.append(Abi(Abi::Itanium, Abi::Linux, Abi::Linux_generic, Abi::Format_ELF, 64));
+            result.append(Abi(Abi::ItaniumArchitecture, Abi::LinuxOS, Abi::GenericLinuxFlavor, Abi::ElfFormat, 64));
             break;
         default:
             ;;
@@ -412,13 +412,13 @@ QList<Abi> Abi::abisOfBinary(const QString &path)
             quint16 machine = (data.at(pePos + 5) << 8) + data.at(pePos + 4);
             switch (machine) {
             case 0x8664: // x86_64
-                result.append(Abi(Abi::x86, Abi::Windows, Abi::Windows_msvc, Abi::Format_PE, 64));
+                result.append(Abi(Abi::X86Architecture, Abi::WindowsOS, Abi::WindowsMsvcFlavor, Abi::PEFormat, 64));
                 break;
             case 0x014c: // i386
-                result.append(Abi(Abi::x86, Abi::Windows, Abi::Windows_msvc, Abi::Format_PE, 32));
+                result.append(Abi(Abi::X86Architecture, Abi::WindowsOS, Abi::WindowsMsvcFlavor, Abi::PEFormat, 32));
                 break;
             case 0x0200: // ia64
-                result.append(Abi(Abi::Itanium, Abi::Windows, Abi::Windows_msvc, Abi::Format_PE, 64));
+                result.append(Abi(Abi::ItaniumArchitecture, Abi::WindowsOS, Abi::WindowsMsvcFlavor, Abi::PEFormat, 64));
                 break;
             }
         }
diff --git a/src/plugins/projectexplorer/abi.h b/src/plugins/projectexplorer/abi.h
index 069eec4f32742e6dfa6e2e85eefd1ecdc0902559..af162d3fc380c953c49a727e109b31038aca9c03 100644
--- a/src/plugins/projectexplorer/abi.h
+++ b/src/plugins/projectexplorer/abi.h
@@ -48,63 +48,63 @@ class PROJECTEXPLORER_EXPORT Abi
 {
 public:
     enum Architecture {
-        UNKNOWN_ARCHITECTURE,
-        ARM,
-        x86,
-        Itanium,
-        Mips,
-        PowerPC
+        UnknownArchitecture,
+        ArmArchitecture,
+        X86Architecture,
+        ItaniumArchitecture,
+        MipsArcitecture,
+        PowerPCArchitecture
     };
 
     enum OS {
-        UNKNOWN_OS,
-        Linux,
-        Mac,
-        Symbian,
-        UNIX,
-        Windows
+        UnknownOS,
+        LinuxOS,
+        MacOS,
+        SymbianOS,
+        UnixOS,
+        WindowsOS
     };
 
-    enum OSFlavour {
-        UNKNOWN_OSFLAVOUR,
+    enum OSFlavor {
+        UnknownFlavor,
 
         // Linux
-        Linux_generic,
-        Linux_harmattan,
-        Linux_maemo,
-        Linux_meego,
+        GenericLinuxFlavor,
+        HarmattanLinuxFlavor,
+        MaemoLinuxFlavor,
+        MeegoLinuxFlavor,
 
         // Mac
-        Mac_generic,
+        GenericMacFlavor,
 
         // Symbian
-        Symbian_device,
-        Symbian_emulator,
+        SymbianDeviceFlavor,
+        SymbianEmulatorFlavor,
 
         // Unix
-        Unix_generic,
+        GenericUnixFlavor,
 
         // Windows
-        Windows_msvc,
-        Windows_msys,
-        Windows_ce
+        WindowsMsvcFlavor,
+        WindowsMSysFlavor,
+        WindowsCEFlavor
     };
 
     enum BinaryFormat {
-        UNKNOWN_FORMAT,
-        Format_ELF,
-        Format_Mach_O,
-        Format_PE,
-        Format_Runtime_QML
+        UnknownFormat,
+        ElfFormat,
+        MachOFormat,
+        PEFormat,
+        RuntimeQmlFormat
     };
 
     Abi() :
-        m_architecture(UNKNOWN_ARCHITECTURE), m_os(UNKNOWN_OS),
-        m_osFlavor(UNKNOWN_OSFLAVOUR), m_binaryFormat(UNKNOWN_FORMAT), m_wordWidth(0)
+        m_architecture(UnknownArchitecture), m_os(UnknownOS),
+        m_osFlavor(UnknownFlavor), m_binaryFormat(UnknownFormat), m_wordWidth(0)
     { }
 
     Abi(const Architecture &a, const OS &o,
-        const OSFlavour &so, const BinaryFormat &f, unsigned char w);
+        const OSFlavor &so, const BinaryFormat &f, unsigned char w);
     Abi(const QString &abiString);
 
     bool operator == (const Abi &other) const;
@@ -114,7 +114,7 @@ public:
 
     Architecture architecture() const { return m_architecture; }
     OS os() const { return m_os; }
-    OSFlavour osFlavor() const { return m_osFlavor; }
+    OSFlavor osFlavor() const { return m_osFlavor; }
     BinaryFormat binaryFormat() const { return m_binaryFormat; }
     unsigned char wordWidth() const { return m_wordWidth; }
 
@@ -122,7 +122,7 @@ public:
 
     static QString toString(const Architecture &a);
     static QString toString(const OS &o);
-    static QString toString(const OSFlavour &of);
+    static QString toString(const OSFlavor &of);
     static QString toString(const BinaryFormat &bf);
     static QString toString(int w);
 
@@ -132,7 +132,7 @@ public:
 private:
     Architecture m_architecture;
     OS m_os;
-    OSFlavour m_osFlavor;
+    OSFlavor m_osFlavor;
     BinaryFormat m_binaryFormat;
     unsigned char m_wordWidth;
 };
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index e6bf504f1cae99162a82aa6a706a113ccc25f0b0..f5d47e11662c666b63c6683b89e2274d7993ec4d 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -165,10 +165,10 @@ static ProjectExplorer::Abi guessGccAbi(const QString &m)
 
     QStringList parts = machine.split(QRegExp("[ /-]"));
 
-    ProjectExplorer::Abi::Architecture arch = ProjectExplorer::Abi::UNKNOWN_ARCHITECTURE;
-    ProjectExplorer::Abi::OS os = ProjectExplorer::Abi::UNKNOWN_OS;
-    ProjectExplorer::Abi::OSFlavour flavor = ProjectExplorer::Abi::UNKNOWN_OSFLAVOUR;
-    ProjectExplorer::Abi::BinaryFormat format = ProjectExplorer::Abi::UNKNOWN_FORMAT;
+    ProjectExplorer::Abi::Architecture arch = ProjectExplorer::Abi::UnknownArchitecture;
+    ProjectExplorer::Abi::OS os = ProjectExplorer::Abi::UnknownOS;
+    ProjectExplorer::Abi::OSFlavor flavor = ProjectExplorer::Abi::UnknownFlavor;
+    ProjectExplorer::Abi::BinaryFormat format = ProjectExplorer::Abi::UnknownFormat;
     int width = 0;
     int unknownCount = 0;
 
@@ -178,40 +178,40 @@ static ProjectExplorer::Abi guessGccAbi(const QString &m)
             continue;
         } else if (p == QLatin1String("i386") || p == QLatin1String("i486") || p == QLatin1String("i586")
                    || p == QLatin1String("i686") || p == QLatin1String("x86")) {
-            arch = ProjectExplorer::Abi::x86;
+            arch = ProjectExplorer::Abi::X86Architecture;
             width = 32;
         } else if (p == QLatin1String("arm")) {
-            arch = ProjectExplorer::Abi::ARM;
+            arch = ProjectExplorer::Abi::ArmArchitecture;
             width = 32;
         } else if (p == QLatin1String("x86_64")) {
-            arch = ProjectExplorer::Abi::x86;
+            arch = ProjectExplorer::Abi::X86Architecture;
             width = 64;
         } else if (p == QLatin1String("w64")) {
             width = 64;
         } else if (p == QLatin1String("linux")) {
-            os = ProjectExplorer::Abi::Linux;
-            flavor = ProjectExplorer::Abi::Linux_generic;
-            format = ProjectExplorer::Abi::Format_ELF;
+            os = ProjectExplorer::Abi::LinuxOS;
+            flavor = ProjectExplorer::Abi::GenericLinuxFlavor;
+            format = ProjectExplorer::Abi::ElfFormat;
         } else if (p == QLatin1String("symbianelf")) {
-            os = ProjectExplorer::Abi::Symbian;
-            flavor = ProjectExplorer::Abi::Symbian_device;
-            format = ProjectExplorer::Abi::Format_ELF;
+            os = ProjectExplorer::Abi::SymbianOS;
+            flavor = ProjectExplorer::Abi::SymbianDeviceFlavor;
+            format = ProjectExplorer::Abi::ElfFormat;
             width = 32;
         } else if (p == QLatin1String("mingw32")) {
-            arch = ProjectExplorer::Abi::x86;
-            os = ProjectExplorer::Abi::Windows;
-            flavor = ProjectExplorer::Abi::Windows_msys;
-            format = ProjectExplorer::Abi::Format_PE;
+            arch = ProjectExplorer::Abi::X86Architecture;
+            os = ProjectExplorer::Abi::WindowsOS;
+            flavor = ProjectExplorer::Abi::WindowsMSysFlavor;
+            format = ProjectExplorer::Abi::PEFormat;
             if (width == 0)
                 width = 32;
         } else if (p == QLatin1String("apple")) {
-            os = ProjectExplorer::Abi::Mac;
-            flavor = ProjectExplorer::Abi::Mac_generic;
-            format = ProjectExplorer::Abi::Format_Mach_O;
+            os = ProjectExplorer::Abi::MacOS;
+            flavor = ProjectExplorer::Abi::GenericMacFlavor;
+            format = ProjectExplorer::Abi::MachOFormat;
         } else if (p == QLatin1String("darwin10")) {
             width = 64;
         } else if (p == QLatin1String("gnueabi")) {
-            format = ProjectExplorer::Abi::Format_ELF;
+            format = ProjectExplorer::Abi::ElfFormat;
         } else {
             ++unknownCount;
         }
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 0cde858943b054a441f0358395b268cbfc079a42..8beddd11651ef7ad4cd27568e6b5e5fc2157e69f 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -286,7 +286,7 @@ MsvcToolChain::MsvcToolChain(Type type, const QString &name, Platform platform,
     m_varsBat(varsBat),
     m_varsBatArg(varsBatArg),
     m_is64bit(true),
-    m_architecture(Abi::x86)
+    m_architecture(Abi::X86Architecture)
 {
     Q_ASSERT(!name.isEmpty());
     Q_ASSERT(!m_varsBat.isEmpty());
@@ -298,7 +298,7 @@ MsvcToolChain::MsvcToolChain(Type type, const QString &name, Platform platform,
         m_is64bit = false;
         break;
     case ProjectExplorer::Internal::MsvcToolChain::ia64:
-        m_architecture = Abi::Itanium;
+        m_architecture = Abi::ItaniumArchitecture;
         break;
     case ProjectExplorer::Internal::MsvcToolChain::s64:
     case ProjectExplorer::Internal::MsvcToolChain::amd64:
@@ -318,7 +318,7 @@ QString MsvcToolChain::typeName() const
 
 Abi MsvcToolChain::targetAbi() const
 {
-    return Abi(m_architecture, Abi::Windows, Abi::Windows_msvc, Abi::Format_PE, m_is64bit ? 64 : 32);
+    return Abi(m_architecture, Abi::WindowsOS, Abi::WindowsMsvcFlavor, Abi::PEFormat, m_is64bit ? 64 : 32);
 }
 
 bool MsvcToolChain::isValid() const
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index d293604f1db7489ce378ff8c245b87b8e16d6d90..81618e6e57d772db2447497965624b5b9f1ea32d 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -229,7 +229,7 @@ RESOURCES += projectexplorer.qrc
 !isEmpty($$(QTC_CPU)) {
     DEFINES += QTC_CPU=$$(QTC_CPU)
 } else {
-    DEFINES += QTC_CPU=x86
+    DEFINES += QTC_CPU=X86Architecture
 }
 
 DEFINES += PROJECTEXPLORER_LIBRARY
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 8a2f4bc36c0e5878a6f72f0783500b084ac4e1ab..e51367318eaa2d0a52e58dc2c9127130eaec6a1c 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -291,7 +291,7 @@ ProjectExplorer::Abi QmlProjectRunConfiguration::abi() const
 {
     ProjectExplorer::Abi hostAbi = ProjectExplorer::Abi::hostAbi();
     return ProjectExplorer::Abi(hostAbi.architecture(), hostAbi.os(), hostAbi.osFlavor(),
-                                ProjectExplorer::Abi::Format_Runtime_QML, hostAbi.wordWidth());
+                                ProjectExplorer::Abi::RuntimeQmlFormat, hostAbi.wordWidth());
 }
 
 QVariantMap QmlProjectRunConfiguration::toMap() const
diff --git a/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp b/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp
index 411e3210f86feddd763cfb48518020a27ae27b3b..b8b1c125cfb48798e6d1fe7016654d1bc0fc5af8 100644
--- a/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp
+++ b/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp
@@ -84,8 +84,8 @@ DebuggingHelperBuildTask::DebuggingHelperBuildTask(QtVersion *version, Tools too
     ProjectExplorer::ToolChain *tc = tcList.at(0);
     tc->addToEnvironment(m_environment);
 
-    if (tc->targetAbi().os() == ProjectExplorer::Abi::Linux
-        && ProjectExplorer::Abi::hostAbi().os() == ProjectExplorer::Abi::Windows)
+    if (tc->targetAbi().os() == ProjectExplorer::Abi::LinuxOS
+        && ProjectExplorer::Abi::hostAbi().os() == ProjectExplorer::Abi::WindowsOS)
         m_target = QLatin1String("-unix");
     m_qmakeCommand = version->qmakeCommand();
     m_makeCommand = tc->makeCommand();
diff --git a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
index 8aafd1d5da1c0bcc379bc45221ef14a956cc688d..180f3b7de1d0f7c9ecb9cbffcfd067bf3eb0ef15 100644
--- a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
+++ b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
@@ -89,8 +89,8 @@ LibraryDetailsController::LibraryDetailsController(
     // if its toolchain is maemo behave the same as we would be on linux
     if (qt4BuildConfiguration
             && qt4BuildConfiguration->toolChain()
-            && (qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::Linux_harmattan
-                || qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::Linux_maemo))
+            && (qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavour
+                || qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavour))
         m_creatorPlatform = CreatorLinux;
 #endif
 
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index ddf478c8ead548a5250717574c49d935ade60793..0d938dabba4cf9d53e54ad822fb3ff9dcd70e0b1 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -174,7 +174,7 @@ bool MakeStep::init()
     // but for now this is the least invasive change
 
     if (toolchain
-            && toolchain->targetAbi().binaryFormat() != ProjectExplorer::Abi::Format_PE
+            && toolchain->targetAbi().binaryFormat() != ProjectExplorer::Abi::PEFormat
             && m_makeCmd.isEmpty())
         Utils::QtcProcess::addArg(&args, QLatin1String("-w"));
 
@@ -303,7 +303,7 @@ void MakeStepConfigWidget::updateDetails()
     QString args = m_makeStep->userArguments();
     ProjectExplorer::ToolChain *toolChain = bc->toolChain();
     if (toolChain
-        && toolChain->targetAbi().binaryFormat() != ProjectExplorer::Abi::Format_PE
+        && toolChain->targetAbi().binaryFormat() != ProjectExplorer::Abi::PEFormat
         && m_makeStep->m_makeCmd.isEmpty())
         Utils::QtcProcess::addArg(&args, QLatin1String("-w"));
     param.setArguments(args);
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index cb73fd02421f122513922e1c9dd8d1da03ac2942..9aa64218f0c29c170698dfb44bf38dcece20c328 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -157,8 +157,8 @@ QStringList QMakeStep::moreArguments()
     QStringList arguments;
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
     ProjectExplorer::ToolChain *tc = bc->toolChain();
-    if (tc && (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::Linux_harmattan
-               || tc->targetAbi().osFlavor() == ProjectExplorer::Abi::Linux_maemo))
+    if (tc && (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavour
+               || tc->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavour))
         arguments << QLatin1String("-unix");
 #endif
     if (!bc->qtVersion()->supportsShadowBuilds()) {
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
index 34cb3ac2fd4012d3ae94f548361aea1a22a427dd..c34986fbaddd3068dcde6dcf92dc4631614238cf 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
@@ -176,13 +176,13 @@ void MaemoToolChain::setQtVersionId(int id)
 
     QtVersion *version = QtVersionManager::instance()->version(id);
     Q_ASSERT(version);
-    ProjectExplorer::Abi::OSFlavour flavour = ProjectExplorer::Abi::Linux_harmattan;
+    ProjectExplorer::Abi::OSFlavor flavour = ProjectExplorer::Abi::HarmattanLinuxFlavor;
     if (MaemoGlobal::isValidMaemo5QtVersion(version))
-        flavour = ProjectExplorer::Abi::Linux_maemo;
+        flavour = ProjectExplorer::Abi::MaemoLinuxFlavor;
     else if (MaemoGlobal::isValidHarmattanQtVersion(version))
-        flavour = ProjectExplorer::Abi::Linux_harmattan;
+        flavour = ProjectExplorer::Abi::HarmattanLinuxFlavor;
     else if (MaemoGlobal::isValidMeegoQtVersion(version))
-        flavour = ProjectExplorer::Abi::Linux_meego;
+        flavour = ProjectExplorer::Abi::MeegoLinuxFlavor;
     else
         return;
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
index 9b3eb8e10ad6103ecec79cfa15af2ee95c750593..0860a518a5a39976d446b39a1845254a0f98be0b 100644
--- a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
@@ -150,10 +150,10 @@ QList<ProjectExplorer::ToolChain *> GcceToolChainFactory::autoDetect()
         GcceToolChain *tc = new GcceToolChain(true);
         tc->setCompilerPath(fullPath);
         tc->setDisplayName(tr("GCCE (%1)").arg(gcceVersion(fullPath)));
-        if (tc->targetAbi() == ProjectExplorer::Abi(ProjectExplorer::Abi::ARM,
-                                                    ProjectExplorer::Abi::Symbian,
-                                                    ProjectExplorer::Abi::Symbian_device,
-                                                    ProjectExplorer::Abi::Format_ELF,
+        if (tc->targetAbi() == ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture,
+                                                    ProjectExplorer::Abi::SymbianOS,
+                                                    ProjectExplorer::Abi::SymbianDeviceFlavor,
+                                                    ProjectExplorer::Abi::ElfFormat,
                                                     32))
         result.append(tc);
     }
diff --git a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
index 8ca13dff5721ee3288931673374f166f6c5a5192..72de9b6205ad3f813339bd04a7fccb58785f9ea2 100644
--- a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
@@ -147,8 +147,8 @@ QString RvctToolChain::typeName() const
 
 ProjectExplorer::Abi RvctToolChain::targetAbi() const
 {
-    return ProjectExplorer::Abi(ProjectExplorer::Abi::ARM, ProjectExplorer::Abi::Symbian,
-                                ProjectExplorer::Abi::Symbian_device, ProjectExplorer::Abi::Format_ELF,
+    return ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::SymbianOS,
+                                ProjectExplorer::Abi::SymbianDeviceFlavor, ProjectExplorer::Abi::ElfFormat,
                                 32);
 }
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index bcce8710bb5192443a5da88e97d2f24facbb9f33..69fe327193dbf9d2fc156068387f14b6f8472653 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -298,7 +298,7 @@ QString S60DeviceRunConfiguration::localExecutableFileName() const
         return QString();
 
     const ProjectExplorer::Abi hostAbi = ProjectExplorer::Abi::hostAbi();
-    if (hostAbi.os() == ProjectExplorer::Abi::Linux) {
+    if (hostAbi.os() == ProjectExplorer::Abi::LinuxOS) {
         return executableFromPackageUnix(ti.buildDir + QLatin1Char('/') + ti.target + QLatin1String("_template.pkg"));
     }
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
index 4c38fe58da1005ed5595ae4cb6dacd065c8402fd..2b10720bfdb1639d08dd3a39fc8a6074ac80b018 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
@@ -154,7 +154,7 @@ S60Manager::~S60Manager()
 
 QString S60Manager::platform(const ProjectExplorer::ToolChain *tc)
 {
-    if (!tc || tc->targetAbi().os() == ProjectExplorer::Abi::Symbian)
+    if (!tc || tc->targetAbi().os() == ProjectExplorer::Abi::SymbianOS)
         return QString();
     QString target = tc->defaultMakeTarget();
     return target.right(target.lastIndexOf(QLatin1Char('-')));
diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp
index 8cb7d8338cd24a150477e136ea44ffe21cd54bdc..fd45f2fea94deecb62811212d4e9902470e1d948 100644
--- a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp
@@ -140,9 +140,9 @@ QString WinscwToolChain::typeName() const
 
 ProjectExplorer::Abi WinscwToolChain::targetAbi() const
 {
-    return ProjectExplorer::Abi(ProjectExplorer::Abi::ARM, ProjectExplorer::Abi::Symbian,
-                                ProjectExplorer::Abi::Symbian_emulator,
-                                ProjectExplorer::Abi::Format_ELF, false);
+    return ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::SymbianOS,
+                                ProjectExplorer::Abi::SymbianEmulatorFlavor,
+                                ProjectExplorer::Abi::ElfFormat, false);
 }
 
 bool WinscwToolChain::isValid() const
diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp
index 23f4e7ce7471cae59ae4e2554047906001057e0c..9e656f17b3552b81c75c69ab4934e60f02043d30 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.cpp
+++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp
@@ -671,7 +671,7 @@ void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item)
 
         ProjectExplorer::Abi qtAbi = qtVersion->qtAbis().at(0);
 
-        if (qtAbi.os() == ProjectExplorer::Abi::Symbian) {
+        if (qtAbi.os() == ProjectExplorer::Abi::SymbianOS) {
             makeS60Visible(true);
             m_versionUi->s60SDKPath->setPath(QDir::toNativeSeparators(m_versions.at(index)->s60SDKDirectory()));
             m_versionUi->sbsV2Path->setPath(m_versions.at(index)->sbsV2Directory());
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 09b4b4ac8022da0cd3df2e447be138be3031c047..096d665975841ffc1b8fc45cad5f88b7246681f0 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1496,36 +1496,36 @@ void QtVersion::updateAbiAndMkspec() const
     // Evaluate all the information we have:
     if (!ce_sdk.isEmpty() && !ce_arch.isEmpty()) {
         // Treat windows CE as desktop.
-        m_abis.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ARM, ProjectExplorer::Abi::Windows,
-                                           ProjectExplorer::Abi::Windows_ce, ProjectExplorer::Abi::Format_PE, false));
+        m_abis.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::WindowsOS,
+                                           ProjectExplorer::Abi::WindowsCEFlavor, ProjectExplorer::Abi::PEFormat, false));
         m_targetIds.insert(Constants::DESKTOP_TARGET_ID);
     } else if (makefileGenerator == QLatin1String("SYMBIAN_ABLD") ||
                makefileGenerator == QLatin1String("SYMBIAN_SBSV2") ||
                makefileGenerator == QLatin1String("SYMBIAN_UNIX")) {
         m_isBuildUsingSbsV2 = (makefileGenerator == QLatin1String("SYMBIAN_SBSV2"));
         if (S60Manager::instance()) {
-            m_abis.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ARM, ProjectExplorer::Abi::Symbian,
-                                               ProjectExplorer::Abi::UNKNOWN_OSFLAVOUR,
-                                               ProjectExplorer::Abi::Format_ELF,
+            m_abis.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::SymbianOS,
+                                               ProjectExplorer::Abi::UnknownFlavor,
+                                               ProjectExplorer::Abi::ElfFormat,
                                                32));
             m_targetIds.insert(QLatin1String(Constants::S60_DEVICE_TARGET_ID));
             m_targetIds.insert(QLatin1String(Constants::S60_EMULATOR_TARGET_ID));
         }
     } else if (MaemoGlobal::isValidMaemo5QtVersion(this)) {
-        m_abis.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ARM, ProjectExplorer::Abi::Linux,
-                                           ProjectExplorer::Abi::Linux_maemo, ProjectExplorer::Abi::Format_ELF,
+        m_abis.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::LinuxOS,
+                                           ProjectExplorer::Abi::MaemoLinuxFlavor, ProjectExplorer::Abi::ElfFormat,
                                            32));
         m_targetIds.insert(QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID));
     } else if (MaemoGlobal::isValidHarmattanQtVersion(this)) {
-        m_abis.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ARM, ProjectExplorer::Abi::Linux,
-                                           ProjectExplorer::Abi::Linux_harmattan,
-                                           ProjectExplorer::Abi::Format_ELF,
+        m_abis.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::LinuxOS,
+                                           ProjectExplorer::Abi::HarmattanLinuxFlavor,
+                                           ProjectExplorer::Abi::ElfFormat,
                                            32));
         m_targetIds.insert(QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID));
     } else if (MaemoGlobal::isValidMeegoQtVersion(this)) {
-        m_abis.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ARM, ProjectExplorer::Abi::Linux,
-                                           ProjectExplorer::Abi::Linux_meego,
-                                           ProjectExplorer::Abi::Format_ELF, 32));
+        m_abis.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::LinuxOS,
+                                           ProjectExplorer::Abi::MeegoLinuxFlavor,
+                                           ProjectExplorer::Abi::ElfFormat, 32));
         m_targetIds.insert(QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID));
     } else if (qmakeCXX.contains("g++")
                || qmakeCXX == "cl" || qmakeCXX == "icl" // intel cl
@@ -1536,7 +1536,7 @@ void QtVersion::updateAbiAndMkspec() const
             QList<ProjectExplorer::Abi> tmp = m_abis;
             m_abis.clear();
             foreach (const ProjectExplorer::Abi &abi, tmp)
-                m_abis.append(ProjectExplorer::Abi(abi.architecture(), abi.os(), ProjectExplorer::Abi::Windows_msys,
+                m_abis.append(ProjectExplorer::Abi(abi.architecture(), abi.os(), ProjectExplorer::Abi::WindowsMSysFlavour,
                                                    abi.binaryFormat(), abi.wordWidth()));
         }
 #endif
@@ -1644,7 +1644,7 @@ void QtVersion::addToEnvironment(Utils::Environment &env) const
 
         env.prependOrSetPath(epocDir.filePath(QLatin1String("epoc32/tools"))); // e.g. make.exe
         // Windows only:
-        if (ProjectExplorer::Abi::hostAbi().os() == ProjectExplorer::Abi::Windows) {
+        if (ProjectExplorer::Abi::hostAbi().os() == ProjectExplorer::Abi::WindowsOS) {
             QString winDir = QLatin1String(qgetenv("WINDIR"));
             if (!winDir.isEmpty())
                 env.prependOrSetPath(QDir(winDir).filePath(QLatin1String("system32")));
@@ -1864,7 +1864,7 @@ bool QtVersion::supportsBinaryDebuggingHelper() const
 {
     if (!isValid())
         return false;
-    return qtAbis().at(0).os() != ProjectExplorer::Abi::Symbian;
+    return qtAbis().at(0).os() != ProjectExplorer::Abi::SymbianOS;
 }
 
 bool QtVersion::hasDocumentation() const