diff --git a/libmemunreachable/Allocator.h b/libmemunreachable/Allocator.h
index b0a4d4cfb..3b5504d72 100644
--- a/libmemunreachable/Allocator.h
+++ b/libmemunreachable/Allocator.h
@@ -209,7 +209,7 @@ using vector = std::vector<T, Allocator<T>>;
 template<class T>
 using list = std::list<T, Allocator<T>>;
 
-template<class T, class Key, class Compare = std::less<Key>>
+template<class Key, class T, class Compare = std::less<Key>>
 using map = std::map<Key, T, Compare, Allocator<std::pair<const Key, T>>>;
 
 template<class Key, class Hash = std::hash<Key>, class KeyEqual = std::equal_to<Key>>
diff --git a/libmemunreachable/HeapWalker.h b/libmemunreachable/HeapWalker.h
index b33893397..7b851c4c1 100644
--- a/libmemunreachable/HeapWalker.h
+++ b/libmemunreachable/HeapWalker.h
@@ -74,7 +74,7 @@ class HeapWalker {
 
   DISALLOW_COPY_AND_ASSIGN(HeapWalker);
   Allocator<HeapWalker> allocator_;
-  using AllocationMap = allocator::map<AllocationInfo, Range, compare_range>;
+  using AllocationMap = allocator::map<Range, AllocationInfo, compare_range>;
   AllocationMap allocations_;
   size_t allocation_bytes_;
   Range valid_allocations_range_;
diff --git a/libmemunreachable/LeakFolding.h b/libmemunreachable/LeakFolding.h
index e181f2719..65e991631 100644
--- a/libmemunreachable/LeakFolding.h
+++ b/libmemunreachable/LeakFolding.h
@@ -81,7 +81,7 @@ class LeakFolding {
   void ComputeDAG();
   void AccumulateLeaks(SCCInfo* dominator);
 
-  allocator::map<LeakInfo, Range, compare_range> leak_map_;
+  allocator::map<Range, LeakInfo, compare_range> leak_map_;
   Graph<LeakInfo> leak_graph_;
   allocator::vector<Allocator<SCCInfo>::unique_ptr> leak_scc_;
 };
diff --git a/libmemunreachable/ThreadCapture.cpp b/libmemunreachable/ThreadCapture.cpp
index 635784020..e8a8392cc 100644
--- a/libmemunreachable/ThreadCapture.cpp
+++ b/libmemunreachable/ThreadCapture.cpp
@@ -86,7 +86,7 @@ class ThreadCaptureImpl {
   void PtraceDetach(pid_t tid, unsigned int signal);
   bool PtraceThreadInfo(pid_t tid, ThreadInfo& thread_info);
 
-  allocator::map<unsigned int, pid_t> captured_threads_;
+  allocator::map<pid_t, unsigned int> captured_threads_;
   Allocator<ThreadCaptureImpl> allocator_;
   pid_t pid_;
   std::function<void(pid_t)> inject_test_func_;