diff --git a/include/dollop.h b/include/dollop.h
index 352bdec1b1eaba9b714c0ec566dbd41831c30c62..df3cdf3a8a65211a50ba1729fdc9cc5b280dacd0 100644
--- a/include/dollop.h
+++ b/include/dollop.h
@@ -140,9 +140,9 @@ class Dollop_t : public Placeable_t, public std::list<DollopEntry_t*> {
 		void WasCoalesced(bool coalesced);
 		bool WasCoalesced(void) const { return m_coalesced; }
 
-		void ReCalculateWorstCaseSize();
+		void ReCalculateSize();
 	private:
-		size_t CalculateWorstCaseSize();
+		size_t CalculateSize();
 		size_t m_size;
 		Dollop_t *m_fallthrough_dollop, *m_fallback_dollop;
 		bool m_fallthrough_patched;
diff --git a/include/dollop_man.h b/include/dollop_man.h
index 370c95c35237c927b471325ca9a130e676542195..e7a0ae157a992f5d763046f1c4a4b3e5701ed7f6 100644
--- a/include/dollop_man.h
+++ b/include/dollop_man.h
@@ -50,7 +50,7 @@ class DollopManager_t {
 	public:
 		DollopManager_t() {};
 
-		virtual size_t DetermineWorstCaseDollopEntrySize(DollopEntry_t *entry)=0;
+		virtual size_t DetermineDollopEntrySize(DollopEntry_t *entry)=0;
 
 		/*
 		 * Add a dollop and all its fallthrough dollops
diff --git a/include/memory_space.h b/include/memory_space.h
index fa4439af76c658f2108309c24b6a27d48d842f0b..97b58334ebc2ea30628e92d3a098535a52559f56 100644
--- a/include/memory_space.h
+++ b/include/memory_space.h
@@ -49,6 +49,7 @@ class MemorySpace_t : public std::map<RangeAddress_t,char>
 		virtual void MergeFreeRange(Range_t range)=0;
 		virtual RangeSet_t::iterator FindFreeRange(RangeAddress_t addr)=0;
 		virtual Range_t GetFreeRange(int size)=0;
+		virtual Range_t GetInfiniteFreeRange()=0;
 		virtual std::list<Range_t> GetFreeRanges(size_t size = 0) = 0;
 		virtual std::pair<RangeSet_t::const_iterator,RangeSet_t::const_iterator>
 			GetNearbyFreeRanges(const RangeAddress_t hint, size_t count = 0) = 0;
diff --git a/include/zipr.h b/include/zipr.h
index 18caa4e72f20afbcef975ba038babf483ef0d706..d4199db34e5b2511e3cd4c0c82a952756be75b85 100644
--- a/include/zipr.h
+++ b/include/zipr.h
@@ -48,7 +48,7 @@ class Zipr_t
 		/*
 		 * These are public functions that the SDK user way want to use.
 		 */
-		virtual size_t DetermineWorstCaseDollopEntrySize(DollopEntry_t*, bool account_for_fallthrough) = 0;
+		virtual size_t DetermineDollopEntrySize(DollopEntry_t*, bool account_for_fallthrough) = 0;
 
 		virtual Zipr_SDK::RangeAddress_t PlopDollopEntry(
 			DollopEntry_t *,
diff --git a/include/zipr_plugin.h b/include/zipr_plugin.h
index c5d59037792159e0c0e14bccb31c1bc35a97d49d..7ed59a5dd226f02be738362220713319006cfc0a 100644
--- a/include/zipr_plugin.h
+++ b/include/zipr_plugin.h
@@ -40,7 +40,7 @@ class ZiprPluginInterface_t
 			return false;
 		}
 
-		virtual size_t WorstCaseInsnSize(libIRDB::Instruction_t*, bool)
+		virtual size_t InsnSize(libIRDB::Instruction_t*, bool)
 		{
 			return 0;
 		}