Index: include/lldb/Target/Process.h
===================================================================
--- include/lldb/Target/Process.h	(revision 108301)
+++ include/lldb/Target/Process.h	(working copy)
@@ -1170,7 +1170,7 @@
     Error
     ClearBreakpointSiteByID (lldb::user_id_t break_id);
 
-    lldb::user_id_t
+    lldb::break_id_t
     CreateBreakpointSite (lldb::BreakpointLocationSP &owner,
                           bool use_hardware);
 
Index: source/Target/Process.cpp
===================================================================
--- source/Target/Process.cpp	(revision 108301)
+++ source/Target/Process.cpp	(working copy)
@@ -522,7 +522,7 @@
     return error;
 }
 
-lldb::user_id_t
+lldb::break_id_t
 Process::CreateBreakpointSite (BreakpointLocationSP &owner, bool use_hardware)
 {
     const addr_t load_addr = owner->GetAddress().GetLoadAddress (this);
Index: source/Breakpoint/BreakpointLocation.cpp
===================================================================
--- source/Breakpoint/BreakpointLocation.cpp	(revision 108301)
+++ source/Breakpoint/BreakpointLocation.cpp	(working copy)
@@ -229,9 +229,9 @@
 
     BreakpointLocationSP myself_sp(m_owner.GetLocationSP (this));
 
-    lldb::user_id_t new_id = process->CreateBreakpointSite (myself_sp, false);
+    lldb::break_id_t new_id = process->CreateBreakpointSite (myself_sp, false);
 
-    if (new_id == LLDB_INVALID_UID)
+    if (new_id == LLDB_INVALID_BREAK_ID)
     {
         Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS);
         if (log)
