diff --git a/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp b/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp
index 34f716cef..a4d72ca39 100644
--- a/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp
+++ b/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp
@@ -35,7 +35,7 @@
 
 #include "configure.h"
 
-namespace Magnum { namespace Trade { namespace TgaImageConverter { namespace Test {
+namespace Magnum { namespace Trade { namespace Test {
 
 class TgaImageConverterTest: public TestSuite::Tester {
     public:
@@ -92,7 +92,7 @@ void TgaImageConverterTest::wrongType() {
 void TgaImageConverterTest::data() {
     const auto data = TgaImageConverter().exportToData(&original);
 
-    TgaImporter::TgaImporter importer;
+    TgaImporter importer;
     CORRADE_VERIFY(importer.openData(data));
     Trade::ImageData2D* converted = importer.image2D(0);
     CORRADE_VERIFY(converted);
@@ -108,6 +108,6 @@ void TgaImageConverterTest::data() {
                     std::string(reinterpret_cast<const char*>(original.data()), 2*3*3));
 }
 
-}}}}
+}}}
 
-CORRADE_TEST_MAIN(Magnum::Trade::TgaImageConverter::Test::TgaImageConverterTest)
+CORRADE_TEST_MAIN(Magnum::Trade::Test::TgaImageConverterTest)
diff --git a/src/Plugins/TgaImageConverter/TgaImageConverter.cpp b/src/Plugins/TgaImageConverter/TgaImageConverter.cpp
index d10ebc3c7..a779acc39 100644
--- a/src/Plugins/TgaImageConverter/TgaImageConverter.cpp
+++ b/src/Plugins/TgaImageConverter/TgaImageConverter.cpp
@@ -38,7 +38,7 @@
 
 #include "TgaImporter/TgaHeader.h"
 
-namespace Magnum { namespace Trade { namespace TgaImageConverter {
+namespace Magnum { namespace Trade {
 
 TgaImageConverter::TgaImageConverter() = default;
 
@@ -68,25 +68,25 @@ Containers::Array<unsigned char> TgaImageConverter::doExportToData(const Image2D
 
     /* Initialize data buffer */
     const UnsignedByte pixelSize = image->pixelSize();
-    auto data = Containers::Array<unsigned char>::zeroInitialized(sizeof(TgaImporter::TgaHeader) + pixelSize*image->size().product());
+    auto data = Containers::Array<unsigned char>::zeroInitialized(sizeof(TgaHeader) + pixelSize*image->size().product());
 
     /* Fill header */
-    auto header = reinterpret_cast<TgaImporter::TgaHeader*>(data.begin());
+    auto header = reinterpret_cast<TgaHeader*>(data.begin());
     header->imageType = image->format() == ImageFormat::Red ? 3 : 2;
     header->bpp = pixelSize*8;
     header->width = Utility::Endianness::littleEndian(image->size().x());
     header->height = Utility::Endianness::littleEndian(image->size().y());
 
     /* Fill data */
-    std::copy(image->data(), image->data()+pixelSize*image->size().product(), data.begin()+sizeof(TgaImporter::TgaHeader));
+    std::copy(image->data(), image->data()+pixelSize*image->size().product(), data.begin()+sizeof(TgaHeader));
 
     #ifdef MAGNUM_TARGET_GLES
     if(image->format() == ImageFormat::RGB) {
-        auto pixels = reinterpret_cast<Math::Vector3<UnsignedByte>*>(data.begin()+sizeof(TgaImporter::TgaHeader));
+        auto pixels = reinterpret_cast<Math::Vector3<UnsignedByte>*>(data.begin()+sizeof(TgaHeader));
         std::transform(pixels, pixels + image->size().product(), pixels,
             [](Math::Vector3<UnsignedByte> pixel) { return swizzle<'b', 'g', 'r'>(pixel); });
     } else if(image->format() == ImageFormat::RGBA) {
-        auto pixels = reinterpret_cast<Math::Vector4<UnsignedByte>*>(data.begin()+sizeof(TgaImporter::TgaHeader));
+        auto pixels = reinterpret_cast<Math::Vector4<UnsignedByte>*>(data.begin()+sizeof(TgaHeader));
         std::transform(pixels, pixels + image->size().product(), pixels,
             [](Math::Vector4<UnsignedByte> pixel) { return swizzle<'b', 'g', 'r', 'a'>(pixel); });
     }
@@ -95,4 +95,4 @@ Containers::Array<unsigned char> TgaImageConverter::doExportToData(const Image2D
     return std::move(data);
 }
 
-}}}
+}}
diff --git a/src/Plugins/TgaImageConverter/TgaImageConverter.h b/src/Plugins/TgaImageConverter/TgaImageConverter.h
index 8de3fc032..9da2320df 100644
--- a/src/Plugins/TgaImageConverter/TgaImageConverter.h
+++ b/src/Plugins/TgaImageConverter/TgaImageConverter.h
@@ -1,5 +1,5 @@
-#ifndef Magnum_Trade_TgaImageConverter_TgaImageConverter_h
-#define Magnum_Trade_TgaImageConverter_TgaImageConverter_h
+#ifndef Magnum_Trade_TgaImageConverter_h
+#define Magnum_Trade_TgaImageConverter_h
 /*
     This file is part of Magnum.
 
@@ -25,7 +25,7 @@
 */
 
 /** @file
- * @brief Class Magnum::Trade::TgaImageConverter::TgaImageConverter
+ * @brief Class Magnum::Trade::TgaImageConverter
  */
 
 #include <Trade/AbstractImageConverter.h>
@@ -37,7 +37,7 @@
 #endif
 #define MAGNUM_TRADE_TGAIMAGECONVERTER_LOCAL CORRADE_VISIBILITY_LOCAL
 
-namespace Magnum { namespace Trade { namespace TgaImageConverter {
+namespace Magnum { namespace Trade {
 
 /**
 @brief TGA image converter
@@ -59,6 +59,6 @@ class MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT TgaImageConverter: public AbstractIm
         Containers::Array<unsigned char> MAGNUM_TRADE_TGAIMAGECONVERTER_LOCAL doExportToData(const Image2D* const image) const override;
 };
 
-}}}
+}}
 
 #endif
diff --git a/src/Plugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp b/src/Plugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp
index c736aa768..eed43e072 100644
--- a/src/Plugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp
+++ b/src/Plugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "TgaImageConverter.h"
+#include "TgaImageConverter/TgaImageConverter.h"
 
-CORRADE_PLUGIN_REGISTER(TgaImageConverter, Magnum::Trade::TgaImageConverter::TgaImageConverter,
+CORRADE_PLUGIN_REGISTER(TgaImageConverter, Magnum::Trade::TgaImageConverter,
     "cz.mosra.magnum.Trade.AbstractImageConverter/0.2")
diff --git a/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp b/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp
index 3c236ab42..bb39fca3c 100644
--- a/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp
+++ b/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp
@@ -33,7 +33,7 @@
 
 #include "configure.h"
 
-namespace Magnum { namespace Trade { namespace TgaImporter { namespace Test {
+namespace Magnum { namespace Trade { namespace Test {
 
 class TgaImporterTest: public TestSuite::Tester {
     public:
@@ -238,6 +238,6 @@ void TgaImporterTest::file() {
                     std::string(reinterpret_cast<const char*>(data) + 18, 2*3));
 }
 
-}}}}
+}}}
 
-CORRADE_TEST_MAIN(Magnum::Trade::TgaImporter::Test::TgaImporterTest)
+CORRADE_TEST_MAIN(Magnum::Trade::Test::TgaImporterTest)
diff --git a/src/Plugins/TgaImporter/TgaHeader.h b/src/Plugins/TgaImporter/TgaHeader.h
index d8cde1f17..875b30bbd 100644
--- a/src/Plugins/TgaImporter/TgaHeader.h
+++ b/src/Plugins/TgaImporter/TgaHeader.h
@@ -1,5 +1,5 @@
-#ifndef Magnum_Trade_TgaImporter_TgaHeader_h
-#define Magnum_Trade_TgaImporter_TgaHeader_h
+#ifndef Magnum_Trade_TgaHeader_h
+#define Magnum_Trade_TgaHeader_h
 /*
     This file is part of Magnum.
 
@@ -25,12 +25,12 @@
 */
 
 /** @file
- * @brief Struct Magnum::Trade::TgaImporter::TgaHeader
+ * @brief Struct Magnum::Trade::TgaHeader
  */
 
 #include <Magnum.h>
 
-namespace Magnum { namespace Trade { namespace TgaImporter {
+namespace Magnum { namespace Trade {
 
 #pragma pack(1)
 /** @brief TGA file header */
@@ -53,6 +53,6 @@ struct TgaHeader {
 
 static_assert(sizeof(TgaHeader) == 18, "TgaHeader size is not 18 bytes");
 
-}}}
+}}
 
 #endif
diff --git a/src/Plugins/TgaImporter/TgaImporter.cpp b/src/Plugins/TgaImporter/TgaImporter.cpp
index 719548d8b..ef9a563a4 100644
--- a/src/Plugins/TgaImporter/TgaImporter.cpp
+++ b/src/Plugins/TgaImporter/TgaImporter.cpp
@@ -38,7 +38,7 @@
 
 #include "TgaHeader.h"
 
-namespace Magnum { namespace Trade { namespace TgaImporter {
+namespace Magnum { namespace Trade {
 
 TgaImporter::TgaImporter(): in(nullptr) {}
 
@@ -150,4 +150,4 @@ ImageData2D* TgaImporter::doImage2D(UnsignedInt) {
     return new ImageData2D(dimensions, format, ImageType::UnsignedByte, buffer);
 }
 
-}}}
+}}
diff --git a/src/Plugins/TgaImporter/TgaImporter.h b/src/Plugins/TgaImporter/TgaImporter.h
index f787bf452..55238e3f9 100644
--- a/src/Plugins/TgaImporter/TgaImporter.h
+++ b/src/Plugins/TgaImporter/TgaImporter.h
@@ -1,5 +1,5 @@
-#ifndef Magnum_Trade_TgaImporter_TgaImporter_h
-#define Magnum_Trade_TgaImporter_TgaImporter_h
+#ifndef Magnum_Trade_TgaImporter_h
+#define Magnum_Trade_TgaImporter_h
 /*
     This file is part of Magnum.
 
@@ -25,7 +25,7 @@
 */
 
 /** @file
- * @brief Class Magnum::Trade::TgaImporter::TgaImporter
+ * @brief Class Magnum::Trade::TgaImporter
  */
 
 #include <Utility/Visibility.h>
@@ -38,7 +38,7 @@
 #endif
 #define MAGNUM_TGAIMPORTER_LOCAL CORRADE_VISIBILITY_LOCAL
 
-namespace Magnum { namespace Trade { namespace TgaImporter {
+namespace Magnum { namespace Trade {
 
 /**
 @brief TGA image importer
@@ -67,6 +67,6 @@ class MAGNUM_TGAIMPORTER_EXPORT TgaImporter: public AbstractImporter {
         std::istream* in;
 };
 
-}}}
+}}
 
 #endif
diff --git a/src/Plugins/TgaImporter/pluginRegistrationTgaImporter.cpp b/src/Plugins/TgaImporter/pluginRegistrationTgaImporter.cpp
index 2f5a1ccab..25a34e435 100644
--- a/src/Plugins/TgaImporter/pluginRegistrationTgaImporter.cpp
+++ b/src/Plugins/TgaImporter/pluginRegistrationTgaImporter.cpp
@@ -24,5 +24,5 @@
 
 #include "TgaImporter.h"
 
-CORRADE_PLUGIN_REGISTER(TgaImporter, Magnum::Trade::TgaImporter::TgaImporter,
+CORRADE_PLUGIN_REGISTER(TgaImporter, Magnum::Trade::TgaImporter,
     "cz.mosra.magnum.Trade.AbstractImporter/0.3")