diff --git a/include/llvm/CodeGen/MachineModuleInfo.h b/include/llvm/CodeGen/MachineModuleInfo.h
index f798e50c433..40c67fd8e8c 100644
--- a/include/llvm/CodeGen/MachineModuleInfo.h
+++ b/include/llvm/CodeGen/MachineModuleInfo.h
@@ -772,7 +772,7 @@ public:
 class DISerializer {
 private:
   Module *M;                            // Definition space module.
-  PointerType *StrPtrTy;                // A "sbyte *" type.  Created lazily.
+  PointerType *StrPtrTy;                // A "i8*" type.  Created lazily.
   PointerType *EmptyStructPtrTy;        // A "{ }*" type.  Created lazily.
   std::map<unsigned, StructType *> TagTypes;
                                         // Types per Tag.  Created lazily.
@@ -796,7 +796,7 @@ public:
   Module *getModule()        const { return M; };
   void setModule(Module *module)  { M = module; }
 
-  /// getStrPtrType - Return a "sbyte *" type.
+  /// getStrPtrType - Return a "i8*" type.
   ///
   const PointerType *getStrPtrType();
   
diff --git a/include/llvm/DerivedTypes.h b/include/llvm/DerivedTypes.h
index 5f4569cfd15..3ea2a6cb946 100644
--- a/include/llvm/DerivedTypes.h
+++ b/include/llvm/DerivedTypes.h
@@ -104,7 +104,7 @@ public:
 
   /// getBitMask - Return a bitmask with ones set for all of the bits
   /// that can be set by an unsigned version of this type.  This is 0xFF for
-  /// sbyte/ubyte, 0xFFFF for shorts, etc.
+  /// i8, 0xFFFF for i16, etc.
   uint64_t getBitMask() const {
     return ~uint64_t(0UL) >> (64-getBitWidth());
   }