9 files changed, 13 insertions, 14 deletions
diff --git a/src/common/mac/dump_syms.h b/src/common/mac/dump_syms.h
index bfc96374..48f6448c 100644
--- a/src/common/mac/dump_syms.h
+++ b/src/common/mac/dump_syms.h
@@ -29,7 +29,7 @@
 
 // dump_syms.h: Interface for DumpSymbols.  This class will take a mach-o file
 // and extract the symbol information and write it to a file using the
-// airbag symbol file format.  
+// breakpad symbol file format.  
 // NOTE: Only Stabs format is currently supported -- not DWARF.
 
 #import <Foundation/Foundation.h>
diff --git a/src/common/mac/dump_syms.mm b/src/common/mac/dump_syms.mm
index aafed3e7..e1dc9661 100644
--- a/src/common/mac/dump_syms.mm
+++ b/src/common/mac/dump_syms.mm
@@ -1,4 +1,3 @@
-//
 // Copyright (c) 2006, Google Inc.
 // All rights reserved.
 //
@@ -45,7 +44,7 @@
 #import "dump_syms.h"
 #import "common/mac/file_id.h"
 
-using google_airbag::FileID;
+using google_breakpad::FileID;
 
 static NSString *kAddressSymbolKey = @"symbol";
 static NSString *kAddressConvertedSymbolKey = @"converted_symbol";
diff --git a/src/common/mac/file_id.cc b/src/common/mac/file_id.cc
index f74f861e..1c7770dd 100644
--- a/src/common/mac/file_id.cc
+++ b/src/common/mac/file_id.cc
@@ -26,7 +26,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // file_id.cc: Return a unique identifier for a file
 //
 // See file_id.h for documentation
@@ -42,7 +42,7 @@
 
 using MacFileUtilities::MachoID;
 
-namespace google_airbag {
+namespace google_breakpad {
 
 FileID::FileID(const char *path) {
   strlcpy(path_, path, sizeof(path_));
@@ -101,4 +101,4 @@ void FileID::ConvertIdentifierToString(const unsigned char identifier[16],
   buffer[(buffer_idx < buffer_length) ? buffer_idx : buffer_idx - 1] = 0;
 }
 
-}  // namespace google_airbag
+}  // namespace google_breakpad
diff --git a/src/common/mac/file_id.h b/src/common/mac/file_id.h
index 663aa369..eb06b0d6 100644
--- a/src/common/mac/file_id.h
+++ b/src/common/mac/file_id.h
@@ -26,7 +26,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // file_id.h: Return a unique identifier for a file
 //
 // Author: Dan Waylonis
@@ -36,7 +36,7 @@
 
 #include <limits.h>
 
-namespace google_airbag {
+namespace google_breakpad {
 
 class FileID {
  public:
@@ -72,7 +72,7 @@ class FileID {
   char path_[PATH_MAX];
 };
 
-}  // namespace google_airbag
+}  // namespace google_breakpad
 
 #endif  // COMMON_MAC_FILE_ID_H__
 
diff --git a/src/common/mac/macho_id.cc b/src/common/mac/macho_id.cc
index 59cd1e21..5fc8bbf8 100644
--- a/src/common/mac/macho_id.cc
+++ b/src/common/mac/macho_id.cc
@@ -26,7 +26,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // macho_id.cc: Functions to gather identifying information from a macho file
 //
 // See macho_id.h for documentation
diff --git a/src/common/mac/macho_id.h b/src/common/mac/macho_id.h
index d9f02181..039bba38 100644
--- a/src/common/mac/macho_id.h
+++ b/src/common/mac/macho_id.h
@@ -26,7 +26,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // macho_id.h: Functions to gather identifying information from a macho file
 //
 // Author: Dan Waylonis
diff --git a/src/common/mac/macho_walker.cc b/src/common/mac/macho_walker.cc
index 81ba3bb5..c14d9eeb 100644
--- a/src/common/mac/macho_walker.cc
+++ b/src/common/mac/macho_walker.cc
@@ -26,7 +26,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // macho_walker.cc: Iterate over the load commands in a mach-o file
 //
 // See macho_walker.h for documentation
diff --git a/src/common/mac/macho_walker.h b/src/common/mac/macho_walker.h
index eb9575b0..6445a4f4 100644
--- a/src/common/mac/macho_walker.h
+++ b/src/common/mac/macho_walker.h
@@ -26,7 +26,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // macho_walker.h: Iterate over the load commands in a mach-o file
 //
 // Author: Dan Waylonis
diff --git a/src/common/mac/string_utilities.cc b/src/common/mac/string_utilities.cc
index b6b1dc66..57cc19ad 100644
--- a/src/common/mac/string_utilities.cc
+++ b/src/common/mac/string_utilities.cc
@@ -32,7 +32,7 @@
 
 namespace MacStringUtils {
 
-using google_airbag::scoped_array;
+using google_breakpad::scoped_array;
 
 std::string ConvertToString(CFStringRef str) {
   CFIndex length = CFStringGetLength(str);