diff --git a/JavaScriptCore/kjs/AllInOneFile.cpp b/JavaScriptCore/kjs/AllInOneFile.cpp
index e0b0edb..5fdf0ed 100644
--- a/JavaScriptCore/kjs/AllInOneFile.cpp
+++ b/JavaScriptCore/kjs/AllInOneFile.cpp
@@ -28,9 +28,9 @@
 
 #include "JSFunction.cpp"
 #include "debugger.cpp"
-#include "array_instance.cpp"
-#include "array_object.cpp"
-#include "bool_object.cpp"
+#include "JSArray.cpp"
+#include "ArrayPrototype.cpp"
+#include "BooleanObject.cpp"
 #include "collector.cpp"
 #if PLATFORM(DARWIN)
 #include "CollectorHeapIntrospector.cpp"
@@ -40,7 +40,7 @@
 #include "DateMath.cpp"
 #include "dtoa.cpp"
 #include "error_object.cpp"
-#include "function_object.cpp"
+#include "FunctionPrototype.cpp"
 #include "grammar.cpp"
 #include "identifier.cpp"
 #include "internal.cpp"
@@ -51,20 +51,20 @@
 #include "lexer.cpp"
 #include "list.cpp"
 #include "lookup.cpp"
-#include "math_object.cpp"
+#include "MathObject.cpp"
 #include "nodes.cpp"
 #include "nodes2string.cpp"
-#include "number_object.cpp"
+#include "NumberObject.cpp"
 #include "JSObject.cpp"
 #include "object_object.cpp"
 #include "operations.cpp"
 #include "Parser.cpp"
-#include "property_map.cpp"
-#include "property_slot.cpp"
+#include "PropertyMap.cpp"
+#include "PropertySlot.cpp"
 #include "PropertyNameArray.cpp"
 #include "regexp.cpp"
-#include "regexp_object.cpp"
-#include "scope_chain.cpp"
+#include "RegExpObject.cpp"
+#include "ScopeChain.cpp"
 #include "string_object.cpp"
 #include "ustring.cpp"
 #include "JSValue.cpp"
diff --git a/JavaScriptCore/kjs/array_object.cpp b/JavaScriptCore/kjs/ArrayPrototype.cpp
similarity index 99%
rename from JavaScriptCore/kjs/array_object.cpp
rename to JavaScriptCore/kjs/ArrayPrototype.cpp
index 2109f82..1409fe0 100644
--- a/JavaScriptCore/kjs/array_object.cpp
+++ b/JavaScriptCore/kjs/ArrayPrototype.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "config.h"
-#include "array_object.h"
-#include "array_object.lut.h"
+#include "ArrayPrototype.h"
+#include "ArrayPrototype.lut.h"
 
 #include "Machine.h"
 #include "error_object.h"
@@ -41,7 +41,7 @@
 
 const ClassInfo ArrayPrototype::info = {"Array", &JSArray::info, 0, ExecState::arrayTable};
 
-/* Source for array_object.lut.h
+/* Source for ArrayPrototype.lut.h
 @begin arrayTable 16
   toString       arrayProtoFuncToString       DontEnum|Function 0
   toLocaleString arrayProtoFuncToLocaleString DontEnum|Function 0
diff --git a/JavaScriptCore/kjs/array_object.h b/JavaScriptCore/kjs/ArrayPrototype.h
similarity index 95%
rename from JavaScriptCore/kjs/array_object.h
rename to JavaScriptCore/kjs/ArrayPrototype.h
index 1ef93f6..d39aaa8 100644
--- a/JavaScriptCore/kjs/array_object.h
+++ b/JavaScriptCore/kjs/ArrayPrototype.h
@@ -18,11 +18,11 @@
  *
  */
 
-#ifndef ARRAY_OBJECT_H_
-#define ARRAY_OBJECT_H_
+#ifndef ArrayPrototype_h
+#define ArrayPrototype_h
 
-#include "array_instance.h"
-#include "function_object.h"
+#include "JSArray.h"
+#include "FunctionPrototype.h"
 #include "lookup.h"
 
 namespace KJS {
@@ -69,4 +69,4 @@
 
 } // namespace KJS
 
-#endif // ARRAY_OBJECT_H_
+#endif // ArrayPrototype_h
diff --git a/JavaScriptCore/kjs/bool_object.cpp b/JavaScriptCore/kjs/BooleanObject.cpp
similarity index 99%
rename from JavaScriptCore/kjs/bool_object.cpp
rename to JavaScriptCore/kjs/BooleanObject.cpp
index bad07d6..131e971 100644
--- a/JavaScriptCore/kjs/bool_object.cpp
+++ b/JavaScriptCore/kjs/BooleanObject.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "bool_object.h"
+#include "BooleanObject.h"
 
 #include "JSGlobalObject.h"
 #include "error_object.h"
diff --git a/JavaScriptCore/kjs/bool_object.h b/JavaScriptCore/kjs/BooleanObject.h
similarity index 94%
rename from JavaScriptCore/kjs/bool_object.h
rename to JavaScriptCore/kjs/BooleanObject.h
index df6b008..3365c01 100644
--- a/JavaScriptCore/kjs/bool_object.h
+++ b/JavaScriptCore/kjs/BooleanObject.h
@@ -18,10 +18,10 @@
  *
  */
 
-#ifndef BOOL_OBJECT_H_
-#define BOOL_OBJECT_H_
+#ifndef BooleanObject_h
+#define BooleanObject_h
 
-#include "function_object.h"
+#include "FunctionPrototype.h"
 #include "JSWrapperObject.h"
 
 namespace KJS {
@@ -62,4 +62,4 @@
 
 } // namespace KJS
 
-#endif // BOOL_OBJECT_H_
+#endif // BooleanObject_h
diff --git a/JavaScriptCore/kjs/ExecState.cpp b/JavaScriptCore/kjs/ExecState.cpp
index 1558f26..da6fe31 100644
--- a/JavaScriptCore/kjs/ExecState.cpp
+++ b/JavaScriptCore/kjs/ExecState.cpp
@@ -27,7 +27,7 @@
 #include "JSGlobalObject.h"
 #include "JSFunction.h"
 #include "JSString.h"
-#include "scope_chain_mark.h"
+#include "ScopeChainMark.h"
 
 namespace KJS {
 
diff --git a/JavaScriptCore/kjs/ExecState.h b/JavaScriptCore/kjs/ExecState.h
index fc6266b..8beb61a 100644
--- a/JavaScriptCore/kjs/ExecState.h
+++ b/JavaScriptCore/kjs/ExecState.h
@@ -29,7 +29,7 @@
 #include "LocalStorageEntry.h"
 #include "completion.h"
 #include "list.h"
-#include "scope_chain.h"
+#include "ScopeChain.h"
 
 namespace KJS  {
 
diff --git a/JavaScriptCore/kjs/function_object.cpp b/JavaScriptCore/kjs/FunctionPrototype.cpp
similarity index 98%
rename from JavaScriptCore/kjs/function_object.cpp
rename to JavaScriptCore/kjs/FunctionPrototype.cpp
index 545a0ae..fa30cd4 100644
--- a/JavaScriptCore/kjs/function_object.cpp
+++ b/JavaScriptCore/kjs/FunctionPrototype.cpp
@@ -19,11 +19,11 @@
  */
 
 #include "config.h"
-#include "function_object.h"
+#include "FunctionPrototype.h"
 
 #include "JSGlobalObject.h"
 #include "Parser.h"
-#include "array_object.h"
+#include "ArrayPrototype.h"
 #include "debugger.h"
 #include "JSFunction.h"
 #include "JSString.h"
diff --git a/JavaScriptCore/kjs/function_object.h b/JavaScriptCore/kjs/FunctionPrototype.h
similarity index 96%
rename from JavaScriptCore/kjs/function_object.h
rename to JavaScriptCore/kjs/FunctionPrototype.h
index e0a7215..03fd954 100644
--- a/JavaScriptCore/kjs/function_object.h
+++ b/JavaScriptCore/kjs/FunctionPrototype.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef FUNCTION_OBJECT_H_
-#define FUNCTION_OBJECT_H_
+#ifndef FunctionPrototype_h
+#define FunctionPrototype_h
 
 #include "object_object.h"
 #include "JSFunction.h"
diff --git a/JavaScriptCore/kjs/array_instance.cpp b/JavaScriptCore/kjs/JSArray.cpp
similarity index 99%
rename from JavaScriptCore/kjs/array_instance.cpp
rename to JavaScriptCore/kjs/JSArray.cpp
index 366c9d3..430969e 100644
--- a/JavaScriptCore/kjs/array_instance.cpp
+++ b/JavaScriptCore/kjs/JSArray.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "config.h"
-#include "array_instance.h"
+#include "JSArray.h"
 
 #include "PropertyNameArray.h"
 #include <wtf/Assertions.h>
diff --git a/JavaScriptCore/kjs/array_instance.h b/JavaScriptCore/kjs/JSArray.h
similarity index 97%
rename from JavaScriptCore/kjs/array_instance.h
rename to JavaScriptCore/kjs/JSArray.h
index 4d698c6..dd364cb 100644
--- a/JavaScriptCore/kjs/array_instance.h
+++ b/JavaScriptCore/kjs/JSArray.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef ARRAY_INSTANCE_H
-#define ARRAY_INSTANCE_H
+#ifndef JSArray_h
+#define JSArray_h
 
 #include "JSObject.h"
 
diff --git a/JavaScriptCore/kjs/JSFunction.cpp b/JavaScriptCore/kjs/JSFunction.cpp
index b827fdc..eea9326 100644
--- a/JavaScriptCore/kjs/JSFunction.cpp
+++ b/JavaScriptCore/kjs/JSFunction.cpp
@@ -34,12 +34,12 @@
 #include "PropertyNameArray.h"
 #include "debugger.h"
 #include "dtoa.h"
-#include "function_object.h"
+#include "FunctionPrototype.h"
 #include "JSString.h"
 #include "lexer.h"
 #include "nodes.h"
 #include "operations.h"
-#include "scope_chain_mark.h"
+#include "ScopeChainMark.h"
 #include <errno.h>
 #include <profiler/Profiler.h>
 #include <stdio.h>
diff --git a/JavaScriptCore/kjs/JSFunction.h b/JavaScriptCore/kjs/JSFunction.h
index 687e5c3..a861495 100644
--- a/JavaScriptCore/kjs/JSFunction.h
+++ b/JavaScriptCore/kjs/JSFunction.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef KJS_FUNCTION_H
-#define KJS_FUNCTION_H
+#ifndef JSFunction_h
+#define JSFunction_h
 
 #include "JSVariableObject.h"
 #include "SymbolTable.h"
diff --git a/JavaScriptCore/kjs/JSGlobalObject.cpp b/JavaScriptCore/kjs/JSGlobalObject.cpp
index 4b7a15e..08e3d75 100644
--- a/JavaScriptCore/kjs/JSGlobalObject.cpp
+++ b/JavaScriptCore/kjs/JSGlobalObject.cpp
@@ -31,17 +31,17 @@
 #include "JSGlobalObject.h"
 
 #include "CodeBlock.h"
-#include "array_object.h"
-#include "bool_object.h"
+#include "ArrayPrototype.h"
+#include "BooleanObject.h"
 #include "date_object.h"
 #include "debugger.h"
 #include "error_object.h"
-#include "function_object.h"
-#include "math_object.h"
-#include "number_object.h"
+#include "FunctionPrototype.h"
+#include "MathObject.h"
+#include "NumberObject.h"
 #include "object_object.h"
-#include "regexp_object.h"
-#include "scope_chain_mark.h"
+#include "RegExpObject.h"
+#include "ScopeChainMark.h"
 #include "string_object.h"
 
 #if HAVE(SYS_TIME_H)
diff --git a/JavaScriptCore/kjs/JSImmediate.cpp b/JavaScriptCore/kjs/JSImmediate.cpp
index d48f1e8..468eb5a 100644
--- a/JavaScriptCore/kjs/JSImmediate.cpp
+++ b/JavaScriptCore/kjs/JSImmediate.cpp
@@ -22,9 +22,9 @@
 #include "JSImmediate.h"
 
 #include "JSGlobalObject.h"
-#include "bool_object.h"
+#include "BooleanObject.h"
 #include "JSNotAnObject.h"
-#include "number_object.h"
+#include "NumberObject.h"
 #include "JSObject.h"
 
 namespace KJS {
diff --git a/JavaScriptCore/kjs/JSObject.h b/JavaScriptCore/kjs/JSObject.h
index 50ad6f5..0471468 100644
--- a/JavaScriptCore/kjs/JSObject.h
+++ b/JavaScriptCore/kjs/JSObject.h
@@ -28,9 +28,9 @@
 #include "ExecState.h"
 #include "JSType.h"
 #include "list.h"
-#include "property_map.h"
-#include "property_slot.h"
-#include "scope_chain.h"
+#include "PropertyMap.h"
+#include "PropertySlot.h"
+#include "ScopeChain.h"
 
 namespace KJS {
 
diff --git a/JavaScriptCore/kjs/JSString.h b/JavaScriptCore/kjs/JSString.h
index 20524d0..9214385 100644
--- a/JavaScriptCore/kjs/JSString.h
+++ b/JavaScriptCore/kjs/JSString.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef INTERNAL_H
-#define INTERNAL_H
+#ifndef JSString_h
+#define JSString_h
 
 #include "JSObject.h"
 #include "ustring.h"
@@ -91,4 +91,4 @@
 
 } // namespace
 
-#endif //  INTERNAL_H
+#endif //  JSString_h
diff --git a/JavaScriptCore/kjs/JSValue.h b/JavaScriptCore/kjs/JSValue.h
index fd7d139..1c8f8ba 100644
--- a/JavaScriptCore/kjs/JSValue.h
+++ b/JavaScriptCore/kjs/JSValue.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef KJS_VALUE_H
-#define KJS_VALUE_H
+#ifndef JSValue_h
+#define JSValue_h
 
 #include "CallData.h"
 #include "ConstructData.h"
@@ -613,4 +613,4 @@
 
 } // namespace KJS
 
-#endif // KJS_VALUE_H
+#endif // JSValue_h
diff --git a/JavaScriptCore/kjs/JSVariableObject.cpp b/JavaScriptCore/kjs/JSVariableObject.cpp
index 51e396d..8365db0 100644
--- a/JavaScriptCore/kjs/JSVariableObject.cpp
+++ b/JavaScriptCore/kjs/JSVariableObject.cpp
@@ -30,7 +30,7 @@
 #include "JSVariableObject.h"
 
 #include "PropertyNameArray.h"
-#include "property_map.h"
+#include "PropertyMap.h"
 
 namespace KJS {
 
diff --git a/JavaScriptCore/kjs/math_object.cpp b/JavaScriptCore/kjs/MathObject.cpp
similarity index 98%
rename from JavaScriptCore/kjs/math_object.cpp
rename to JavaScriptCore/kjs/MathObject.cpp
index 5dceca3..a0dcda7 100644
--- a/JavaScriptCore/kjs/math_object.cpp
+++ b/JavaScriptCore/kjs/MathObject.cpp
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-#include "math_object.h"
-#include "math_object.lut.h"
+#include "MathObject.h"
+#include "MathObject.lut.h"
 
 #include "operations.h"
 #include <time.h>
@@ -33,7 +33,7 @@
 
 const ClassInfo MathObject::info = { "Math", 0, 0, ExecState::mathTable };
 
-/* Source for math_object.lut.h
+/* Source for MathObject.lut.h
 @begin mathTable 21
   E             MathObject::Euler           DontEnum|DontDelete|ReadOnly
   LN2           MathObject::Ln2             DontEnum|DontDelete|ReadOnly
diff --git a/JavaScriptCore/kjs/math_object.h b/JavaScriptCore/kjs/MathObject.h
similarity index 96%
rename from JavaScriptCore/kjs/math_object.h
rename to JavaScriptCore/kjs/MathObject.h
index f534b4a..658cb55 100644
--- a/JavaScriptCore/kjs/math_object.h
+++ b/JavaScriptCore/kjs/MathObject.h
@@ -19,10 +19,10 @@
  *
  */
 
-#ifndef MATH_OBJECT_H_
-#define MATH_OBJECT_H_
+#ifndef MathObject_h
+#define MathObject_h
 
-#include "function_object.h"
+#include "FunctionPrototype.h"
 #include "lookup.h"
 
 namespace KJS {
@@ -62,4 +62,4 @@
 
 } // namespace KJS
 
-#endif // MATH_OBJECT_H_
+#endif // MathObject_h
diff --git a/JavaScriptCore/kjs/number_object.cpp b/JavaScriptCore/kjs/NumberObject.cpp
similarity index 99%
rename from JavaScriptCore/kjs/number_object.cpp
rename to JavaScriptCore/kjs/NumberObject.cpp
index 7cbeb05..90dba9d 100644
--- a/JavaScriptCore/kjs/number_object.cpp
+++ b/JavaScriptCore/kjs/NumberObject.cpp
@@ -20,8 +20,8 @@
  */
 
 #include "config.h"
-#include "number_object.h"
-#include "number_object.lut.h"
+#include "NumberObject.h"
+#include "NumberObject.lut.h"
 
 #include "dtoa.h"
 #include "error_object.h"
@@ -452,7 +452,7 @@
 
 const ClassInfo NumberConstructor::info = { "Function", &InternalFunction::info, 0, ExecState::numberTable };
 
-/* Source for number_object.lut.h
+/* Source for NumberObject.lut.h
 @begin numberTable 5
   NaN                   NumberConstructor::NaNValue       DontEnum|DontDelete|ReadOnly
   NEGATIVE_INFINITY     NumberConstructor::NegInfinity    DontEnum|DontDelete|ReadOnly
diff --git a/JavaScriptCore/kjs/number_object.h b/JavaScriptCore/kjs/NumberObject.h
similarity index 95%
rename from JavaScriptCore/kjs/number_object.h
rename to JavaScriptCore/kjs/NumberObject.h
index 4470892..e946ac3 100644
--- a/JavaScriptCore/kjs/number_object.h
+++ b/JavaScriptCore/kjs/NumberObject.h
@@ -19,10 +19,10 @@
  *
  */
 
-#ifndef NUMBER_OBJECT_H_
-#define NUMBER_OBJECT_H_
+#ifndef NumberObject_h
+#define NumberObject_h
 
-#include "function_object.h"
+#include "FunctionPrototype.h"
 #include "JSWrapperObject.h"
 
 namespace KJS {
@@ -73,4 +73,4 @@
 
 } // namespace KJS
 
-#endif // NUMBER_OBJECT_H_
+#endif // NumberObject_h
diff --git a/JavaScriptCore/kjs/property_map.cpp b/JavaScriptCore/kjs/PropertyMap.cpp
similarity index 99%
rename from JavaScriptCore/kjs/property_map.cpp
rename to JavaScriptCore/kjs/PropertyMap.cpp
index 5bb62bc..0fa25d9 100644
--- a/JavaScriptCore/kjs/property_map.cpp
+++ b/JavaScriptCore/kjs/PropertyMap.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "property_map.h"
+#include "PropertyMap.h"
 
 #include "JSObject.h"
 #include "protect.h"
diff --git a/JavaScriptCore/kjs/property_map.h b/JavaScriptCore/kjs/PropertyMap.h
similarity index 98%
rename from JavaScriptCore/kjs/property_map.h
rename to JavaScriptCore/kjs/PropertyMap.h
index e64071f..28b5575 100644
--- a/JavaScriptCore/kjs/property_map.h
+++ b/JavaScriptCore/kjs/PropertyMap.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef KJS_PROPERTY_MAP_H_
-#define KJS_PROPERTY_MAP_H_
+#ifndef PropertyMap_h
+#define PropertyMap_h
 
 #include "identifier.h"
 #include "protect.h"
diff --git a/JavaScriptCore/kjs/property_slot.cpp b/JavaScriptCore/kjs/PropertySlot.cpp
similarity index 98%
rename from JavaScriptCore/kjs/property_slot.cpp
rename to JavaScriptCore/kjs/PropertySlot.cpp
index d8f2617..8ebbaec 100644
--- a/JavaScriptCore/kjs/property_slot.cpp
+++ b/JavaScriptCore/kjs/PropertySlot.cpp
@@ -21,7 +21,7 @@
 
 
 #include "config.h"
-#include "property_slot.h"
+#include "PropertySlot.h"
 
 #include "JSGlobalObject.h"
 #include "JSObject.h"
diff --git a/JavaScriptCore/kjs/property_slot.h b/JavaScriptCore/kjs/PropertySlot.h
similarity index 97%
rename from JavaScriptCore/kjs/property_slot.h
rename to JavaScriptCore/kjs/PropertySlot.h
index fa00513..fb5820d 100644
--- a/JavaScriptCore/kjs/property_slot.h
+++ b/JavaScriptCore/kjs/PropertySlot.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef KJS_PROPERTY_SLOT_H
-#define KJS_PROPERTY_SLOT_H
+#ifndef PropertySlot_h
+#define PropertySlot_h
 
 #include "identifier.h"
 #include "JSValue.h"
@@ -168,4 +168,4 @@
 
 }
 
-#endif // KJS_PROPERTY_SLOT_H
+#endif // PropertySlot_h
diff --git a/JavaScriptCore/kjs/regexp_object.cpp b/JavaScriptCore/kjs/RegExpObject.cpp
similarity index 98%
rename from JavaScriptCore/kjs/regexp_object.cpp
rename to JavaScriptCore/kjs/RegExpObject.cpp
index 72f63f5..365d341 100644
--- a/JavaScriptCore/kjs/regexp_object.cpp
+++ b/JavaScriptCore/kjs/RegExpObject.cpp
@@ -19,11 +19,11 @@
  */
 
 #include "config.h"
-#include "regexp_object.h"
-#include "regexp_object.lut.h"
+#include "RegExpObject.h"
+#include "RegExpObject.lut.h"
 
-#include "array_instance.h"
-#include "array_object.h"
+#include "JSArray.h"
+#include "ArrayPrototype.h"
 #include "error_object.h"
 #include "JSString.h"
 #include "JSObject.h"
@@ -124,7 +124,7 @@
 
 const ClassInfo RegExpObject::info = { "RegExp", 0, 0, ExecState::regExpTable };
 
-/* Source for regexp_object.lut.h
+/* Source for RegExpObject.lut.h
 @begin regExpTable 5
     global        RegExpObject::Global       DontDelete|ReadOnly|DontEnum
     ignoreCase    RegExpObject::IgnoreCase   DontDelete|ReadOnly|DontEnum
@@ -244,7 +244,7 @@
 
 const ClassInfo RegExpConstructor::info = { "Function", &InternalFunction::info, 0, ExecState::regExpConstructorTable };
 
-/* Source for regexp_object.lut.h
+/* Source for RegExpObject.lut.h
 @begin regExpConstructorTable 21
   input           RegExpConstructor::Input          None
   $_              RegExpConstructor::Input          DontEnum
diff --git a/JavaScriptCore/kjs/regexp_object.h b/JavaScriptCore/kjs/RegExpObject.h
similarity index 97%
rename from JavaScriptCore/kjs/regexp_object.h
rename to JavaScriptCore/kjs/RegExpObject.h
index 2459177..336f0f5 100644
--- a/JavaScriptCore/kjs/regexp_object.h
+++ b/JavaScriptCore/kjs/RegExpObject.h
@@ -18,10 +18,10 @@
  *
  */
 
-#ifndef REGEXP_OBJECT_H_
-#define REGEXP_OBJECT_H_
+#ifndef RegExpObject_h
+#define RegExpObject_h
 
-#include "function_object.h"
+#include "FunctionPrototype.h"
 #include "regexp.h"
 
 namespace KJS {
diff --git a/JavaScriptCore/kjs/scope_chain.cpp b/JavaScriptCore/kjs/ScopeChain.cpp
similarity index 98%
rename from JavaScriptCore/kjs/scope_chain.cpp
rename to JavaScriptCore/kjs/ScopeChain.cpp
index c7f2923f..4ac2ea1 100644
--- a/JavaScriptCore/kjs/scope_chain.cpp
+++ b/JavaScriptCore/kjs/ScopeChain.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "config.h"
-#include "scope_chain.h"
+#include "ScopeChain.h"
 
 #include "PropertyNameArray.h"
 #include "JSObject.h"
diff --git a/JavaScriptCore/kjs/scope_chain.h b/JavaScriptCore/kjs/ScopeChain.h
similarity index 100%
rename from JavaScriptCore/kjs/scope_chain.h
rename to JavaScriptCore/kjs/ScopeChain.h
diff --git a/JavaScriptCore/kjs/scope_chain_mark.h b/JavaScriptCore/kjs/ScopeChainMark.h
similarity index 93%
rename from JavaScriptCore/kjs/scope_chain_mark.h
rename to JavaScriptCore/kjs/ScopeChainMark.h
index a60fdd7..d03193e 100644
--- a/JavaScriptCore/kjs/scope_chain_mark.h
+++ b/JavaScriptCore/kjs/ScopeChainMark.h
@@ -18,10 +18,10 @@
  *
  */
 
-#ifndef scope_chain_mark_h
-#define scope_chain_mark_h
+#ifndef ScopeChainMark_h
+#define ScopeChainMark_h
 
-#include "scope_chain.h"
+#include "ScopeChain.h"
 
 namespace KJS {
 
diff --git a/JavaScriptCore/kjs/Shell.cpp b/JavaScriptCore/kjs/Shell.cpp
index ff219ec..5f4230f 100644
--- a/JavaScriptCore/kjs/Shell.cpp
+++ b/JavaScriptCore/kjs/Shell.cpp
@@ -26,7 +26,7 @@
 #include "JSGlobalObject.h"
 #include "JSLock.h"
 #include "Parser.h"
-#include "array_object.h"
+#include "ArrayPrototype.h"
 #include "collector.h"
 #include "JSFunction.h"
 #include "InitializeThreading.h"
diff --git a/JavaScriptCore/kjs/error_object.h b/JavaScriptCore/kjs/error_object.h
index b991b0d..41f8c5f 100644
--- a/JavaScriptCore/kjs/error_object.h
+++ b/JavaScriptCore/kjs/error_object.h
@@ -21,7 +21,7 @@
 #ifndef ERROR_OBJECT_H_
 #define ERROR_OBJECT_H_
 
-#include "function_object.h"
+#include "FunctionPrototype.h"
 
 namespace KJS {
 
diff --git a/JavaScriptCore/kjs/internal.cpp b/JavaScriptCore/kjs/internal.cpp
index 8c3031b..69fffa6 100644
--- a/JavaScriptCore/kjs/internal.cpp
+++ b/JavaScriptCore/kjs/internal.cpp
@@ -24,21 +24,21 @@
 #include "JSString.h"
 
 #include "ExecState.h"
-#include "array_object.h"
-#include "bool_object.h"
+#include "ArrayPrototype.h"
+#include "BooleanObject.h"
 #include "collector.h"
 #include "date_object.h"
 #include "debugger.h"
 #include "error_object.h"
-#include "function_object.h"
+#include "FunctionPrototype.h"
 #include "lexer.h"
-#include "math_object.h"
+#include "MathObject.h"
 #include "nodes.h"
-#include "number_object.h"
+#include "NumberObject.h"
 #include "JSObject.h"
 #include "object_object.h"
 #include "operations.h"
-#include "regexp_object.h"
+#include "RegExpObject.h"
 #include "string_object.h"
 #include <math.h>
 #include <stdio.h>
diff --git a/JavaScriptCore/kjs/nodes.cpp b/JavaScriptCore/kjs/nodes.cpp
index 924e578..8027c10 100644
--- a/JavaScriptCore/kjs/nodes.cpp
+++ b/JavaScriptCore/kjs/nodes.cpp
@@ -31,12 +31,12 @@
 #include "JSGlobalObject.h"
 #include "Parser.h"
 #include "PropertyNameArray.h"
-#include "array_object.h"
+#include "ArrayPrototype.h"
 #include "debugger.h"
-#include "function_object.h"
+#include "FunctionPrototype.h"
 #include "lexer.h"
 #include "operations.h"
-#include "regexp_object.h"
+#include "RegExpObject.h"
 #include <math.h>
 #include <wtf/Assertions.h>
 #include <wtf/HashCountedSet.h>
diff --git a/JavaScriptCore/kjs/object_object.cpp b/JavaScriptCore/kjs/object_object.cpp
index 171d0b2..0ce754e 100644
--- a/JavaScriptCore/kjs/object_object.cpp
+++ b/JavaScriptCore/kjs/object_object.cpp
@@ -23,7 +23,7 @@
 
 #include "JSGlobalObject.h"
 #include "operations.h"
-#include "function_object.h"
+#include "FunctionPrototype.h"
 #include <stdio.h>
 
 namespace KJS {
diff --git a/JavaScriptCore/kjs/string_object.cpp b/JavaScriptCore/kjs/string_object.cpp
index 211e621..5407989 100644
--- a/JavaScriptCore/kjs/string_object.cpp
+++ b/JavaScriptCore/kjs/string_object.cpp
@@ -25,10 +25,10 @@
 
 #include "JSWrapperObject.h"
 #include "PropertyNameArray.h"
-#include "array_object.h"
+#include "ArrayPrototype.h"
 #include "error_object.h"
 #include "operations.h"
-#include "regexp_object.h"
+#include "RegExpObject.h"
 #include <wtf/MathExtras.h>
 #include <wtf/unicode/Collator.h>
 
diff --git a/JavaScriptCore/kjs/string_object.h b/JavaScriptCore/kjs/string_object.h
index 7f27724..802e7ee 100644
--- a/JavaScriptCore/kjs/string_object.h
+++ b/JavaScriptCore/kjs/string_object.h
@@ -22,7 +22,7 @@
 #ifndef STRING_OBJECT_H_
 #define STRING_OBJECT_H_
 
-#include "function_object.h"
+#include "FunctionPrototype.h"
 #include "JSWrapperObject.h"
 #include "JSString.h"
 #include "lookup.h"