diff --git a/Src/IACore/imp/inl/iacore/algorithm/interface/binary-search.interface.inl b/Src/IACore/imp/inl/iacore/algorithm/interface/binary-search.interface.inl
index 846d273..0a8a5a8 100644
--- a/Src/IACore/imp/inl/iacore/algorithm/interface/binary-search.interface.inl
+++ b/Src/IACore/imp/inl/iacore/algorithm/interface/binary-search.interface.inl
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <IACore/iterator.hpp>
+#include <IACore/Iterator.hpp>
 
 namespace ia
 {
diff --git a/Src/IACore/imp/inl/iacore/algorithm/interface/quick-sort.interface.inl b/Src/IACore/imp/inl/iacore/algorithm/interface/quick-sort.interface.inl
index cf96f5d..17b3eb9 100644
--- a/Src/IACore/imp/inl/iacore/algorithm/interface/quick-sort.interface.inl
+++ b/Src/IACore/imp/inl/iacore/algorithm/interface/quick-sort.interface.inl
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <IACore/iterator.hpp>
+#include <IACore/Iterator.hpp>
 
 namespace ia
 {
diff --git a/Src/IACore/imp/inl/iacore/container/interface/fixed.interface.inl b/Src/IACore/imp/inl/iacore/container/interface/fixed.interface.inl
index d57df31..2f031b9 100644
--- a/Src/IACore/imp/inl/iacore/container/interface/fixed.interface.inl
+++ b/Src/IACore/imp/inl/iacore/container/interface/fixed.interface.inl
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <IACore/allocator.hpp>
-#include <IACore/memory.hpp>
+#include <IACore/Allocator.hpp>
+#include <IACore/Memory.hpp>
 
 #include "span.interface.inl"
 
diff --git a/Src/IACore/imp/inl/iacore/container/interface/iterator.interface.inl b/Src/IACore/imp/inl/iacore/container/interface/iterator.interface.inl
index 0a7c0a0..edd6867 100644
--- a/Src/IACore/imp/inl/iacore/container/interface/iterator.interface.inl
+++ b/Src/IACore/imp/inl/iacore/container/interface/iterator.interface.inl
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <IACore/iterator.hpp>
+#include <IACore/Iterator.hpp>
 
 namespace ia
 {
diff --git a/Src/IACore/imp/inl/iacore/container/interface/span.interface.inl b/Src/IACore/imp/inl/iacore/container/interface/span.interface.inl
index 03d5fa3..f28049b 100644
--- a/Src/IACore/imp/inl/iacore/container/interface/span.interface.inl
+++ b/Src/IACore/imp/inl/iacore/container/interface/span.interface.inl
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include <IACore/allocator.hpp>
-#include <IACore/hashable.hpp>
-#include <IACore/memory.hpp>
+#include <IACore/Allocator.hpp>
+#include <IACore/Hashable.hpp>
+#include <IACore/Memory.hpp>
 
 #include "iterator.interface.inl"
 
diff --git a/Src/IACore/imp/inl/iacore/hashable/interface/iihashable.interface.inl b/Src/IACore/imp/inl/iacore/hashable/interface/iihashable.interface.inl
index e61fdf0..2871d75 100644
--- a/Src/IACore/imp/inl/iacore/hashable/interface/iihashable.interface.inl
+++ b/Src/IACore/imp/inl/iacore/hashable/interface/iihashable.interface.inl
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <IACore/base.hpp>
+#include <IACore/Base.hpp>
 
 namespace ia
 {
diff --git a/Src/IACore/imp/inl/iacore/iterator/interface/iterator.interface.inl b/Src/IACore/imp/inl/iacore/iterator/interface/iterator.interface.inl
index 1a14786..896f31c 100644
--- a/Src/IACore/imp/inl/iacore/iterator/interface/iterator.interface.inl
+++ b/Src/IACore/imp/inl/iacore/iterator/interface/iterator.interface.inl
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <IACore/base.hpp>
+#include <IACore/Base.hpp>
 
 namespace ia
 {
diff --git a/Src/IACore/imp/inl/iacore/list/interface/entry.interface.inl b/Src/IACore/imp/inl/iacore/list/interface/entry.interface.inl
index 4ffef63..a2c381a 100644
--- a/Src/IACore/imp/inl/iacore/list/interface/entry.interface.inl
+++ b/Src/IACore/imp/inl/iacore/list/interface/entry.interface.inl
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <IACore/allocator.hpp>
+#include <IACore/Allocator.hpp>
 
 namespace ia
 {
diff --git a/Src/IACore/imp/inl/iacore/list/interface/list.interface.inl b/Src/IACore/imp/inl/iacore/list/interface/list.interface.inl
index c89a53e..7ff4efc 100644
--- a/Src/IACore/imp/inl/iacore/list/interface/list.interface.inl
+++ b/Src/IACore/imp/inl/iacore/list/interface/list.interface.inl
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <IACore/allocator.hpp>
+#include <IACore/Allocator.hpp>
 
 //#include "iterator.interface.inl"
 #include "entry.interface.inl"
diff --git a/Src/IACore/imp/inl/iacore/map/interface/map.interface.inl b/Src/IACore/imp/inl/iacore/map/interface/map.interface.inl
index 71099fd..3ce3472 100644
--- a/Src/IACore/imp/inl/iacore/map/interface/map.interface.inl
+++ b/Src/IACore/imp/inl/iacore/map/interface/map.interface.inl
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include <IACore/list.hpp>
-#include <IACore/vector.hpp>
-#include <IACore/hashable.hpp>
+#include <IACore/List.hpp>
+#include <IACore/Vector.hpp>
+#include <IACore/Hashable.hpp>
 
 namespace ia
 {
diff --git a/Src/IACore/imp/inl/iacore/memory/allocator/interface/iiallocator.interface.inl b/Src/IACore/imp/inl/iacore/memory/allocator/interface/iiallocator.interface.inl
index ea84fef..b61a8cc 100644
--- a/Src/IACore/imp/inl/iacore/memory/allocator/interface/iiallocator.interface.inl
+++ b/Src/IACore/imp/inl/iacore/memory/allocator/interface/iiallocator.interface.inl
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <memory.h>
-#include <IACore/base.hpp>
+#include <IACore/Base.hpp>
 
 namespace ia
 {
diff --git a/Src/IACore/imp/inl/iacore/memory/allocator/interface/orchestrator.interface.inl b/Src/IACore/imp/inl/iacore/memory/allocator/interface/orchestrator.interface.inl
index 17719ec..02e39bc 100644
--- a/Src/IACore/imp/inl/iacore/memory/allocator/interface/orchestrator.interface.inl
+++ b/Src/IACore/imp/inl/iacore/memory/allocator/interface/orchestrator.interface.inl
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <IACore/base.hpp>
+#include <IACore/Base.hpp>
 
 namespace ia
 {
diff --git a/Src/IACore/imp/inl/iacore/memory/ptr/interface/refptr.interface.inl b/Src/IACore/imp/inl/iacore/memory/ptr/interface/refptr.interface.inl
index bb943d1..1b549bd 100644
--- a/Src/IACore/imp/inl/iacore/memory/ptr/interface/refptr.interface.inl
+++ b/Src/IACore/imp/inl/iacore/memory/ptr/interface/refptr.interface.inl
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <IACore/base.hpp>
+#include <IACore/Base.hpp>
 #include <memory>
 
 namespace ia
diff --git a/Src/IACore/imp/inl/iacore/string/interface/string.interface.inl b/Src/IACore/imp/inl/iacore/string/interface/string.interface.inl
index 8770040..e2d4257 100644
--- a/Src/IACore/imp/inl/iacore/string/interface/string.interface.inl
+++ b/Src/IACore/imp/inl/iacore/string/interface/string.interface.inl
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <IACore/container.hpp>
+#include <IACore/Container.hpp>
 
 namespace ia
 {
diff --git a/Src/IACore/imp/inl/iacore/vector/interface/unordered.interface.inl b/Src/IACore/imp/inl/iacore/vector/interface/unordered.interface.inl
index f4dd986..fbf3999 100644
--- a/Src/IACore/imp/inl/iacore/vector/interface/unordered.interface.inl
+++ b/Src/IACore/imp/inl/iacore/vector/interface/unordered.interface.inl
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <IACore/container.hpp>
+#include <IACore/Container.hpp>
 
 namespace ia
 {
diff --git a/Src/IACore/imp/inl/iacore/vector/ordered.inl b/Src/IACore/imp/inl/iacore/vector/ordered.inl
index cb0bbcb..c20f111 100644
--- a/Src/IACore/imp/inl/iacore/vector/ordered.inl
+++ b/Src/IACore/imp/inl/iacore/vector/ordered.inl
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <IACore/algorithm.hpp>
+#include <IACore/Algorithm.hpp>
 
 #include "interface/ordered.interface.inl"
 
diff --git a/Src/IACore/inc/hpp/IACore/Base.hpp b/Src/IACore/inc/hpp/IACore/Base.hpp
index f7eae3a..37ef9b8 100644
--- a/Src/IACore/inc/hpp/IACore/Base.hpp
+++ b/Src/IACore/inc/hpp/IACore/Base.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #if __STDC_HOSTED__ and !IACORE_FREESTANDING
-#include <IACore/types.hpp>
+#include <IACore/Types.hpp>
 #include <stdlib.h>
 #include <math.h>
 #include <cstring>
diff --git a/Src/IACore/inc/hpp/IACore/File.hpp b/Src/IACore/inc/hpp/IACore/File.hpp
index be542c6..7f489c6 100644
--- a/Src/IACore/inc/hpp/IACore/File.hpp
+++ b/Src/IACore/inc/hpp/IACore/File.hpp
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include <IACore/exception.hpp>
-#include <IACore/string.hpp>
-#include <IACore/vector.hpp>
+#include <IACore/Exception.hpp>
+#include <IACore/String.hpp>
+#include <IACore/Vector.hpp>
 
 namespace ia
 {
@@ -111,17 +111,17 @@ namespace ia
             constexpr char pathDelimiter = '/';
 
             auto t = path.rfind(pathDelimiter);
-            if (t == String::npos)
+            if (t == path.end())
             {
                 if CONSTEXPR (includeExtension)
                     return path;
 
-                return path.substr(0, path.rfind('.'));
+                return path.slice(0, path.rfind('.'));
             }
             if constexpr (includeExtension)
-                return path.substr(t + 1);
+                return path.slice(t + 1, path.end());
 
-            return path.substr(t + 1, path.rfind('.') - t - 1);
+            return path.slice(t + 1, path.begin() + (path.rfind('.') - t) - 1);
         }
 
         String ExtractDirectoryFromPath(IN CONST String &path)
@@ -129,10 +129,10 @@ namespace ia
             constexpr char pathDelimiter = '/';
 
             auto t = path.rfind(pathDelimiter);
-            if (t == String::npos)
+            if (t == path.end())
                 return "./";
 
-            return path.substr(0, t + 1);
+            return path.slice(0, t + 1);
         }
 
       private:
diff --git a/Src/IACoreTest/imp/cpp/Main.cpp b/Src/IACoreTest/imp/cpp/Main.cpp
index 11d0e9d..a23b074 100644
--- a/Src/IACoreTest/imp/cpp/Main.cpp
+++ b/Src/IACoreTest/imp/cpp/Main.cpp
@@ -1,8 +1,8 @@
 #include <IACore/Logger.hpp>
-#include <IACore/file.hpp>
+#include <IACore/File.hpp>
 
-#include <IACore/vector.hpp>
-#include <IACore/map.hpp>
+#include <IACore/Vector.hpp>
+#include <IACore/Map.hpp>
 
 using namespace ia;