diff --git a/Framework/Algorithms/inc/MantidAlgorithms/AbsorptionCorrection.h b/Framework/Algorithms/inc/MantidAlgorithms/AbsorptionCorrection.h
index e6364cd9839fe74ac26c49387740c0563db85d5d..805130499c34717ecfcedbca251969da19ff2428 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/AbsorptionCorrection.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/AbsorptionCorrection.h
@@ -147,8 +147,7 @@ private:
   double m_lambdaFixed; ///< The wavelength corresponding to the fixed energy,
   /// if provided
 
-  typedef double (*expfunction)(
-      double);             ///< Typedef pointer to exponential function
+  using expfunction = double (*)(double); ///< Typedef pointer to exponential function
   expfunction EXPONENTIAL; ///< Pointer to exponential function
 };
 
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/BinaryOperation.h b/Framework/Algorithms/inc/MantidAlgorithms/BinaryOperation.h
index 6dfa0e3120bd6cca3343272aff59cea0f9767f2f..27e60f7b4330d031bc265746264a9bb7309cb6b3 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/BinaryOperation.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/BinaryOperation.h
@@ -63,8 +63,8 @@ public:
    * Value at that index: workspace index of the rhs to apply to the WI in the
    * lhs. -1 if not found.
    */
-  typedef std::vector<int64_t> BinaryOperationTable;
-  typedef boost::shared_ptr<BinaryOperationTable> BinaryOperationTable_sptr;
+  using BinaryOperationTable = std::vector<int64_t>;
+  using BinaryOperationTable_sptr = boost::shared_ptr<BinaryOperationTable>;
 
   static BinaryOperationTable_sptr
   buildBinaryOperationTable(const API::MatrixWorkspace_const_sptr &lhs,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertAxisByFormula.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertAxisByFormula.h
index 568f6a168fa92668f29f3731c082c57f040cd356..ada468038c9f62ff5016d25db915f3856f93053b 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertAxisByFormula.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertAxisByFormula.h
@@ -72,7 +72,7 @@ private:
     double value;
     bool isGeometric;
   };
-  typedef boost::shared_ptr<Variable> Variable_ptr;
+  using Variable_ptr = boost::shared_ptr<Variable>;
 
   void setAxisValue(const double &value, std::vector<Variable_ptr> &variables);
   void calculateValues(mu::Parser &p, std::vector<double> &vec,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/IQTransform.h b/Framework/Algorithms/inc/MantidAlgorithms/IQTransform.h
index b648722f7c7baa5b35281d2389b75cb447cdfb47..5b0c8bd04e477aac93ae0e912eb1c0fb5a76fedb 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/IQTransform.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/IQTransform.h
@@ -87,7 +87,7 @@ private:
   subtractBackgroundWS(API::MatrixWorkspace_sptr ws,
                        API::MatrixWorkspace_sptr background);
 
-  typedef void (IQTransform::*TransformFunc)(API::MatrixWorkspace_sptr);
+  using TransformFunc = void (IQTransform::*)(API::MatrixWorkspace_sptr);
   typedef std::map<std::string, TransformFunc> TransformMap;
   TransformMap
       m_transforms; ///< A map of transformation name and function pointers
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/PDDetermineCharacterizations.h b/Framework/Algorithms/inc/MantidAlgorithms/PDDetermineCharacterizations.h
index 860285ea1a8e6d7cf08892b194b4f7366b46c22a..597021442b178b67b7ada3eb5cbb9f6fccd475c4 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/PDDetermineCharacterizations.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/PDDetermineCharacterizations.h
@@ -15,7 +15,7 @@ namespace Kernel {
 /// forward declaration
 class PropertyMantager;
 /// Typedef for a shared pointer to a PropertyManager
-typedef boost::shared_ptr<PropertyManager> PropertyManager_sptr;
+using PropertyManager_sptr = boost::shared_ptr<PropertyManager>;
 }
 
 namespace Algorithms {
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/PaddingAndApodization.h b/Framework/Algorithms/inc/MantidAlgorithms/PaddingAndApodization.h
index a5fe87e91037f55f1b325e7c8ca61cf175d8f7a9..28577cc96ab6dafb27f3bc01171caa140e0c1f79 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/PaddingAndApodization.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/PaddingAndApodization.h
@@ -67,7 +67,7 @@ private:
   // Overridden Algorithm methods
   void init() override;
   void exec() override;
-  typedef double (*fptr)(const double time, const double decayConstant);
+  using fptr = double (*)(const double, const double);
   fptr getApodizationFunction(const std::string method);
   HistogramData::Histogram
   applyApodizationFunction(const HistogramData::Histogram &histogram,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SpectrumAlgorithm.h b/Framework/Algorithms/inc/MantidAlgorithms/SpectrumAlgorithm.h
index 4b8ebfaa3b7c018a25a1d618fc941c1a602884db..37b9b8bc7808c56219941fc20707bdd16bb297da 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SpectrumAlgorithm.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SpectrumAlgorithm.h
@@ -63,7 +63,7 @@ private:
       : gens<N - 1, N - 1, S...> /** @endcond */ {/** @cond */
   };
   template <int... S> struct gens<0, S...> {/** @endcond */
-    typedef seq<S...> type;
+    using type = seq<S...>;
   };
 
   /** Helpers for for_each(), struct contains and 2 specializations.
@@ -169,7 +169,7 @@ void SpectrumAlgorithm::ifEventWorkspaceClearMRU(
     const DataObjects::EventWorkspace &workspace);
 
 /// Typedef for a shared pointer to a SpectrumAlgorithm
-typedef boost::shared_ptr<SpectrumAlgorithm> SpectrumAlgorithm_sptr;
+using SpectrumAlgorithm_sptr = boost::shared_ptr<SpectrumAlgorithm>;
 
 } // namespace Algorithms
 } // namespace Mantid
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h b/Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h
index a11a01e463b5584b5ee45f701cd48c836cc0bc79..183ec88c50d8bb64e7c36fa4e3962d11baf70a42 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h
@@ -49,7 +49,7 @@ public:
 private:
   /// Helper typedef. For storing indexes of special values per spectra per
   /// workspace.
-  typedef std::vector<std::vector<size_t>> SpecialTypeIndexes;
+  using SpecialTypeIndexes = std::vector<std::vector<size_t> >;
   /// Overwrites Algorithm method.
   void init() override;
   /// Overwrites Algorithm method.
diff --git a/Framework/Algorithms/src/CalculateTransmission.cpp b/Framework/Algorithms/src/CalculateTransmission.cpp
index e1ea669899bebc2e60d9a69199c331c4a56c5611..77feb1f7a8579368babba52f46bd41cc6b17a2d8 100644
--- a/Framework/Algorithms/src/CalculateTransmission.cpp
+++ b/Framework/Algorithms/src/CalculateTransmission.cpp
@@ -265,7 +265,7 @@ CalculateTransmission::extractSpectra(API::MatrixWorkspace_sptr ws,
   // means that lexical_cast cannot be used directly as the call is ambiguous
   // so we need to define a function pointer that can resolve the overloaded
   // lexical_cast function
-  typedef std::string (*from_size_t)(const size_t &);
+  using from_size_t = std::string (*)(const size_t &);
 
   std::transform(
       indices.begin(), indices.end(), indexStrings.begin(),
diff --git a/Framework/Algorithms/src/CreateCalFileByNames.cpp b/Framework/Algorithms/src/CreateCalFileByNames.cpp
index c15105423451ab1fb989e6c65e5a96b66763d6f2..dbc4804af45886493d87ba7b4176b8457aea4822 100644
--- a/Framework/Algorithms/src/CreateCalFileByNames.cpp
+++ b/Framework/Algorithms/src/CreateCalFileByNames.cpp
@@ -88,9 +88,9 @@ void CreateCalFileByNames::exec() {
   vgroups.clear();
 
   // Find Detectors that belong to groups
-  typedef boost::shared_ptr<const Geometry::ICompAssembly> sptr_ICompAss;
-  typedef boost::shared_ptr<const Geometry::IComponent> sptr_IComp;
-  typedef boost::shared_ptr<const Geometry::IDetector> sptr_IDet;
+  using sptr_ICompAss = boost::shared_ptr<const Geometry::ICompAssembly>;
+  using sptr_IComp = boost::shared_ptr<const Geometry::IComponent>;
+  using sptr_IDet = boost::shared_ptr<const Geometry::IDetector>;
   std::queue<std::pair<sptr_ICompAss, int>> assemblies;
   sptr_ICompAss current =
       boost::dynamic_pointer_cast<const Geometry::ICompAssembly>(inst);
diff --git a/Framework/Algorithms/src/CreateDummyCalFile.cpp b/Framework/Algorithms/src/CreateDummyCalFile.cpp
index 163b64b8c4ae134b178d9a86a8148e7c44f21274..607310f25805a5cd436e2c7d62590ad7a356841c 100644
--- a/Framework/Algorithms/src/CreateDummyCalFile.cpp
+++ b/Framework/Algorithms/src/CreateDummyCalFile.cpp
@@ -85,9 +85,9 @@ void CreateDummyCalFile::exec() {
   vgroups.clear();
 
   // Find Detectors that belong to groups
-  typedef boost::shared_ptr<const Geometry::ICompAssembly> sptr_ICompAss;
-  typedef boost::shared_ptr<const Geometry::IComponent> sptr_IComp;
-  typedef boost::shared_ptr<const Geometry::IDetector> sptr_IDet;
+  using sptr_ICompAss = boost::shared_ptr<const Geometry::ICompAssembly>;
+  using sptr_IComp = boost::shared_ptr<const Geometry::IComponent>;
+  using sptr_IDet = boost::shared_ptr<const Geometry::IDetector>;
   std::queue<std::pair<sptr_ICompAss, int>> assemblies;
   sptr_ICompAss current =
       boost::dynamic_pointer_cast<const Geometry::ICompAssembly>(inst);
diff --git a/Framework/Algorithms/src/CreateGroupingWorkspace.cpp b/Framework/Algorithms/src/CreateGroupingWorkspace.cpp
index fba1465d0357ef3ee12047bc4f9bf95ba7dcae0b..c22d148a5edebddc0e150111c2a54c1ff20d124a 100644
--- a/Framework/Algorithms/src/CreateGroupingWorkspace.cpp
+++ b/Framework/Algorithms/src/CreateGroupingWorkspace.cpp
@@ -249,9 +249,9 @@ std::map<detid_t, int> makeGroupingByNames(std::string GroupNames,
   // Find Detectors that belong to groups
   if (!group_map.empty()) {
     // Find Detectors that belong to groups
-    typedef boost::shared_ptr<const Geometry::ICompAssembly> sptr_ICompAss;
-    typedef boost::shared_ptr<const Geometry::IComponent> sptr_IComp;
-    typedef boost::shared_ptr<const Geometry::IDetector> sptr_IDet;
+    using sptr_ICompAss = boost::shared_ptr<const Geometry::ICompAssembly>;
+    using sptr_IComp = boost::shared_ptr<const Geometry::IComponent>;
+    using sptr_IDet = boost::shared_ptr<const Geometry::IDetector>;
     std::queue<std::pair<sptr_ICompAss, int>> assemblies;
     sptr_ICompAss current =
         boost::dynamic_pointer_cast<const Geometry::ICompAssembly>(inst);
diff --git a/Framework/Algorithms/src/NormaliseByDetector.cpp b/Framework/Algorithms/src/NormaliseByDetector.cpp
index 35d8b68ea84bd92dbeae797270a49ef2f2bc8c42..5ff4b8526afbde3b03367d0c171b806c3730960a 100644
--- a/Framework/Algorithms/src/NormaliseByDetector.cpp
+++ b/Framework/Algorithms/src/NormaliseByDetector.cpp
@@ -108,7 +108,7 @@ void NormaliseByDetector::processHistogram(size_t wsIndex,
   const std::string &fitFunctionName = foundFittingParam.getFunction();
   IFunction_sptr function =
       FunctionFactory::Instance().createFunction(fitFunctionName);
-  typedef std::vector<std::string> ParamNames;
+  using ParamNames = std::vector<std::string>;
   ParamNames allParamNames = function->getParameterNames();
 
   // Lookup each parameter name.
diff --git a/Framework/Algorithms/src/PaddingAndApodization.cpp b/Framework/Algorithms/src/PaddingAndApodization.cpp
index f6e5086ab4efcae3d14894df9cac81b8bca7321f..971921a9fafa39a6514472464e37d48d19cc6691 100644
--- a/Framework/Algorithms/src/PaddingAndApodization.cpp
+++ b/Framework/Algorithms/src/PaddingAndApodization.cpp
@@ -125,7 +125,7 @@ void PaddingAndApodization::exec() {
   setProperty("OutputWorkspace", outputWS);
 }
 
-typedef double (*fptr)(const double time, const double decayConstant);
+using fptr = double (*)(const double, const double);
 /**
 * Gets a pointer to the relevant
 * apodization function
diff --git a/Framework/Algorithms/src/PerformIndexOperations.cpp b/Framework/Algorithms/src/PerformIndexOperations.cpp
index 8b31982a6ad0131b906f46600cd6c2c1fc9e6360..55c225f3d526609aa252d54a6b92cabcee7ffa70 100644
--- a/Framework/Algorithms/src/PerformIndexOperations.cpp
+++ b/Framework/Algorithms/src/PerformIndexOperations.cpp
@@ -45,7 +45,7 @@ public:
 };
 
 /// Helper typedef
-typedef std::vector<boost::shared_ptr<Command>> VecCommands;
+using VecCommands = std::vector<boost::shared_ptr<Command> >;
 
 /**
  * Command yielding no result.
@@ -140,7 +140,7 @@ public:
 };
 
 /// Helper typedef for vector of command parsers
-typedef std::vector<boost::shared_ptr<CommandParser>> VecCommandParsers;
+using VecCommandParsers = std::vector<boost::shared_ptr<CommandParser> >;
 
 /**
  * Command parser base class for common concrete command parser types.
diff --git a/Framework/Algorithms/src/PolarizationCorrection.cpp b/Framework/Algorithms/src/PolarizationCorrection.cpp
index d3f4983a28dda537a8e7659fc3320d01f9db9164..b3c949ab0997a07d1c6a669a21fae007e0109d2c 100644
--- a/Framework/Algorithms/src/PolarizationCorrection.cpp
+++ b/Framework/Algorithms/src/PolarizationCorrection.cpp
@@ -102,7 +102,7 @@ void validateInputWorkspace(WorkspaceGroup_sptr &ws) {
   }
 }
 
-typedef std::vector<double> VecDouble;
+using VecDouble = std::vector<double>;
 }
 
 namespace Mantid {
diff --git a/Framework/Algorithms/src/SmoothNeighbours.cpp b/Framework/Algorithms/src/SmoothNeighbours.cpp
index dbbae50f50d7ec87f949b14b63edb84d3bb28958..53f1f980a86ab6df0aa0f7ee6baca35ffda50488 100644
--- a/Framework/Algorithms/src/SmoothNeighbours.cpp
+++ b/Framework/Algorithms/src/SmoothNeighbours.cpp
@@ -24,8 +24,8 @@ using namespace Mantid::Geometry;
 using namespace Mantid::API;
 using namespace Mantid::DataObjects;
 
-typedef std::vector<Mantid::Kernel::Property *> VecProperties;
-typedef const VecProperties ConstVecProperties;
+using VecProperties = std::vector<Mantid::Kernel::Property *>;
+using ConstVecProperties = const VecProperties;
 
 namespace Mantid {
 namespace Algorithms {
diff --git a/Framework/Algorithms/src/SofQWNormalisedPolygon.cpp b/Framework/Algorithms/src/SofQWNormalisedPolygon.cpp
index e5833ee1064a41ecf52d2a2c339723849501f863..912ded1386f02d886f78af0f1b03e06d886182ad 100644
--- a/Framework/Algorithms/src/SofQWNormalisedPolygon.cpp
+++ b/Framework/Algorithms/src/SofQWNormalisedPolygon.cpp
@@ -21,7 +21,7 @@ namespace Mantid {
 namespace Algorithms {
 // Setup typedef for later use
 typedef std::map<specnum_t, Mantid::Kernel::V3D> SpectraDistanceMap;
-typedef Geometry::IDetector_const_sptr DetConstPtr;
+using DetConstPtr = Geometry::IDetector_const_sptr;
 
 // Register the algorithm into the AlgorithmFactory
 DECLARE_ALGORITHM(SofQWNormalisedPolygon)
diff --git a/Framework/Algorithms/src/SofQWPolygon.cpp b/Framework/Algorithms/src/SofQWPolygon.cpp
index 8fe9b4c015a2c7f98485cd0adb88583ae22dbc39..75d0c160cd60f88fed0d2891f021fa284ae7925a 100644
--- a/Framework/Algorithms/src/SofQWPolygon.cpp
+++ b/Framework/Algorithms/src/SofQWPolygon.cpp
@@ -63,8 +63,7 @@ void SofQWPolygon::exec() {
 
   // Select the calculate Q method based on the mode
   // rather than doing this repeatedly in the loop
-  typedef double (SofQWPolygon::*QCalculation)(double, double, double, double)
-      const;
+  using QCalculation = double (SofQWPolygon::*)(double, double, double, double) const;
   QCalculation qCalculator;
   if (m_EmodeProperties.m_emode == 1) {
     qCalculator = &SofQWPolygon::calculateDirectQ;
diff --git a/Framework/Algorithms/src/VesuvioL1ThetaResolution.cpp b/Framework/Algorithms/src/VesuvioL1ThetaResolution.cpp
index 5058883a38015414a45735df2eec8bbe9a0b8c39..1598952f01efd20f709478d22537acc4424fd395 100644
--- a/Framework/Algorithms/src/VesuvioL1ThetaResolution.cpp
+++ b/Framework/Algorithms/src/VesuvioL1ThetaResolution.cpp
@@ -461,7 +461,7 @@ VesuvioL1ThetaResolution::processDistribution(MatrixWorkspace_sptr ws,
 /** Generates a random number.
  */
 double VesuvioL1ThetaResolution::random() {
-  typedef boost::uniform_real<double> uniform_double;
+  using uniform_double = boost::uniform_real<double>;
   return boost::variate_generator<boost::mt19937 &, uniform_double>(
       m_generator, uniform_double(0.0, 1.0))();
 }
diff --git a/Framework/Algorithms/test/RebinByPulseTimesTest.h b/Framework/Algorithms/test/RebinByPulseTimesTest.h
index 63095f03137da0e520441cc185592ddc947f7a7c..fe6bfb4b78f74b5d8c8fbc809a22c681d505e2ed 100644
--- a/Framework/Algorithms/test/RebinByPulseTimesTest.h
+++ b/Framework/Algorithms/test/RebinByPulseTimesTest.h
@@ -10,7 +10,7 @@ using Mantid::Algorithms::RebinByPulseTimes;
 //=====================================================================================
 // Functional Tests
 //=====================================================================================
-typedef RebinByTimeBaseTest<RebinByPulseTimes> Super;
+using Super = RebinByTimeBaseTest<RebinByPulseTimes>;
 class RebinByPulseTimesTest : public CxxTest::TestSuite, public Super {
 
 public:
diff --git a/Framework/Algorithms/test/RebinByTimeAtSampleTest.h b/Framework/Algorithms/test/RebinByTimeAtSampleTest.h
index 6529dd117106debb785a3e2e8a09fb3798cf70da..aaf90573ec8e58296e897cc1a1eccf8ccf20ee14 100644
--- a/Framework/Algorithms/test/RebinByTimeAtSampleTest.h
+++ b/Framework/Algorithms/test/RebinByTimeAtSampleTest.h
@@ -55,7 +55,7 @@ createSinglePulseEventWorkspace(const V3D &sourcePosition,
 //=====================================================================================
 // Functional Tests
 //=====================================================================================
-typedef RebinByTimeBaseTest<RebinByTimeAtSample> Super;
+using Super = RebinByTimeBaseTest<RebinByTimeAtSample>;
 class RebinByTimeAtSampleTest : public CxxTest::TestSuite, public Super {
 
 public:
diff --git a/Framework/Algorithms/test/SofQWNormalisedPolygonTest.h b/Framework/Algorithms/test/SofQWNormalisedPolygonTest.h
index 26588e4816b39cd7e799f6d47617fdc5da4630ff..009c38a3c49de8a09590260efadea8fbd8a11b0d 100644
--- a/Framework/Algorithms/test/SofQWNormalisedPolygonTest.h
+++ b/Framework/Algorithms/test/SofQWNormalisedPolygonTest.h
@@ -62,7 +62,7 @@ public:
 
     // Spectra-detector mapping
     const size_t nspectra(6);
-    typedef std::set<int> IDSet;
+    using IDSet = std::set<int>;
     std::vector<IDSet> expectedIDs(nspectra);
     IDSet s1 = {3};
     expectedIDs[0] = s1;
diff --git a/Framework/Algorithms/test/SofQWPolygonTest.h b/Framework/Algorithms/test/SofQWPolygonTest.h
index ba471e5d45036188061b8f0ce6f96708cc4b8b2d..a4befaa06112d4984025c45337264b40d362ec11 100644
--- a/Framework/Algorithms/test/SofQWPolygonTest.h
+++ b/Framework/Algorithms/test/SofQWPolygonTest.h
@@ -59,7 +59,7 @@ public:
 
     // Spectra-detector mapping
     const size_t nspectra(6);
-    typedef std::set<int> IDSet;
+    using IDSet = std::set<int>;
     std::vector<IDSet> expectedIDs(nspectra);
     IDSet s1 = {3};
     expectedIDs[0] = s1;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h b/Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h
index 736817697cba0cd670b81facece7e52c69ef3bb8..2637ec6f143896e8f0882bf1ae0a8cf27d3e3f05 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h
@@ -109,9 +109,8 @@ public:
   virtual bool threadSafe() const;
 };
 
-typedef boost::shared_ptr<EventWorkspaceCollection>
-    EventWorkspaceCollection_sptr;
-typedef std::unique_ptr<EventWorkspaceCollection> EventWorkspaceCollection_uptr;
+using EventWorkspaceCollection_sptr = boost::shared_ptr<EventWorkspaceCollection>;
+using EventWorkspaceCollection_uptr = std::unique_ptr<EventWorkspaceCollection>;
 
 } // namespace DataHandling
 } // namespace Mantid
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h
index b02b915af12f0c72026ac7cf99005cc4f6ee5e27..21e12011e364e0861cae0d04875e5b94d417d3ef 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h
@@ -40,10 +40,10 @@ namespace DataHandling {
 #undef LOADEVENTPRENEXUS_ALLOW_PARALLEL
 
 /// Make the code clearer by having this an explicit type
-typedef int PixelType;
+using PixelType = int;
 
 /// Type for the DAS time of flight (data file)
-typedef int DasTofType;
+using DasTofType = int;
 
 /// Structure that matches the form in the binary event list.
 #pragma pack(push, 4) // Make sure the structure is 8 bytes.
diff --git a/Framework/Nexus/inc/MantidNexus/NexusClasses.h b/Framework/Nexus/inc/MantidNexus/NexusClasses.h
index 4a49958af93064927bfb836a9d08f9c95cdc997b..f8598304b6c1368384568752eadc03d6aecb962a 100644
--- a/Framework/Nexus/inc/MantidNexus/NexusClasses.h
+++ b/Framework/Nexus/inc/MantidNexus/NexusClasses.h
@@ -471,17 +471,17 @@ private:
 };
 
 /// The integer dataset type
-typedef NXDataSetTyped<int> NXInt;
+using NXInt = NXDataSetTyped<int>;
 /// The float dataset type
-typedef NXDataSetTyped<float> NXFloat;
+using NXFloat = NXDataSetTyped<float>;
 /// The double dataset type
-typedef NXDataSetTyped<double> NXDouble;
+using NXDouble = NXDataSetTyped<double>;
 /// The char dataset type
-typedef NXDataSetTyped<char> NXChar;
+using NXChar = NXDataSetTyped<char>;
 /// The size_t dataset type
-typedef NXDataSetTyped<std::size_t> NXSize;
+using NXSize = NXDataSetTyped<std::size_t>;
 /// The size_t dataset type
-typedef NXDataSetTyped<unsigned int> NXUInt;
+using NXUInt = NXDataSetTyped<unsigned int>;
 
 //-------------------- classes --------------------------//