From 5683f076331d2831eb4720b65bb53e8d01ca33ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Einar=20Johan=20Tr=C3=B8an=20S=C3=B8ma=CC=8Aen?=
 <einarjohants@gmail.com>
Date: Sat, 21 Jul 2012 18:19:07 +0200
Subject: [PATCH] WINTERMUTE: Rename CamelCased filenames to
 prefixed_under_score-filenames

This is mostly a lead-up to namespacing the Ad/Base folders, and then
possibly removing the prefixes from the files, it also has the added
benefit of getting rid of the odd case-typos that makes for issues
on platforms that don't ignore case.
---
 .../ad/{AdActor.cpp => ad_actor.cpp}          |  34 +--
 .../wintermute/ad/{AdActor.h => ad_actor.h}   |   6 +-
 .../ad/{AdEntity.cpp => ad_entity.cpp}        |  40 ++--
 .../wintermute/ad/{AdEntity.h => ad_entity.h} |   2 +-
 .../wintermute/ad/{AdGame.cpp => ad_game.cpp} |  62 +++---
 engines/wintermute/ad/{AdGame.h => ad_game.h} |   4 +-
 .../ad/{AdInventory.cpp => ad_inventory.cpp}  |   6 +-
 .../ad/{AdInventory.h => ad_inventory.h}      |   2 +-
 ...dInventoryBox.cpp => ad_inventory_box.cpp} |  22 +-
 .../{AdInventoryBox.h => ad_inventory_box.h}  |   2 +-
 .../wintermute/ad/{AdItem.cpp => ad_item.cpp} |  26 +--
 engines/wintermute/ad/{AdItem.h => ad_item.h} |   2 +-
 .../ad/{AdLayer.cpp => ad_layer.cpp}          |  18 +-
 .../wintermute/ad/{AdLayer.h => ad_layer.h}   |   0
 .../ad/{AdNodeState.cpp => ad_node_state.cpp} |  10 +-
 .../ad/{AdNodeState.h => ad_node_state.h}     |   0
 .../ad/{AdObject.cpp => ad_object.cpp}        |  44 ++--
 .../wintermute/ad/{AdObject.h => ad_object.h} |   4 +-
 .../wintermute/ad/{AdPath.cpp => ad_path.cpp} |   4 +-
 engines/wintermute/ad/{AdPath.h => ad_path.h} |   2 +-
 .../ad/{AdPathPoint.cpp => ad_path_point.cpp} |   4 +-
 .../ad/{AdPathPoint.h => ad_path_point.h}     |   2 +-
 .../ad/{AdRegion.cpp => ad_region.cpp}        |  14 +-
 .../wintermute/ad/{AdRegion.h => ad_region.h} |   2 +-
 .../ad/{AdResponse.cpp => ad_response.cpp}    |   8 +-
 .../ad/{AdResponse.h => ad_response.h}        |   4 +-
 ...{AdResponseBox.cpp => ad_response_box.cpp} |  28 +--
 .../ad/{AdResponseBox.h => ad_response_box.h} |   2 +-
 ...nseContext.cpp => ad_response_context.cpp} |   4 +-
 ...esponseContext.h => ad_response_context.h} |   2 +-
 .../ad/{AdRotLevel.cpp => ad_rot_level.cpp}   |  12 +-
 .../ad/{AdRotLevel.h => ad_rot_level.h}       |   2 +-
 .../{AdScaleLevel.cpp => ad_scale_level.cpp}  |  10 +-
 .../ad/{AdScaleLevel.h => ad_scale_level.h}   |   2 +-
 .../ad/{AdScene.cpp => ad_scene.cpp}          |  60 +++---
 .../wintermute/ad/{AdScene.h => ad_scene.h}   |   2 +-
 .../ad/{AdSceneNode.cpp => ad_scene_node.cpp} |   4 +-
 .../ad/{AdSceneNode.h => ad_scene_node.h}     |   6 +-
 .../{AdSceneState.cpp => ad_scene_state.cpp}  |   4 +-
 .../ad/{AdSceneState.h => ad_scene_state.h}   |   2 +-
 .../ad/{AdSentence.cpp => ad_sentence.cpp}    |  22 +-
 .../ad/{AdSentence.h => ad_sentence.h}        |   4 +-
 .../ad/{AdSpriteSet.cpp => ad_sprite_set.cpp} |  10 +-
 .../ad/{AdSpriteSet.h => ad_sprite_set.h}     |   4 +-
 .../ad/{AdTalkDef.cpp => ad_talk_def.cpp}     |  16 +-
 .../ad/{AdTalkDef.h => ad_talk_def.h}         |   2 +-
 .../{AdTalkHolder.cpp => ad_talk_holder.cpp}  |  14 +-
 .../ad/{AdTalkHolder.h => ad_talk_holder.h}   |   2 +-
 .../ad/{AdTalkNode.cpp => ad_talk_node.cpp}   |  12 +-
 .../ad/{AdTalkNode.h => ad_talk_node.h}       |   2 +-
 .../wintermute/ad/{AdTypes.h => ad_types.h}   |   0
 ...aypointGroup.cpp => ad_waypoint_group.cpp} |  14 +-
 ...{AdWaypointGroup.h => ad_waypoint_group.h} |   2 +-
 .../wintermute/base/{BBase.cpp => base.cpp}   |   8 +-
 engines/wintermute/base/{BBase.h => base.h}   |   0
 .../{BActiveRect.cpp => base_active_rect.cpp} |   6 +-
 .../{BActiveRect.h => base_active_rect.h}     |   4 +-
 .../base/{BDebugger.cpp => base_debugger.cpp} |   2 +-
 .../base/{BDebugger.h => base_debugger.h}     |   2 +-
 ...BDynBuffer.cpp => base_dynamic_buffer.cpp} |   4 +-
 .../{BDynBuffer.h => base_dynamic_buffer.h}   |   2 +-
 .../base/{BFader.cpp => base_fader.cpp}       |   4 +-
 .../base/{BFader.h => base_fader.h}           |   2 +-
 ...BFileManager.cpp => base_file_manager.cpp} |  20 +-
 .../{BFileManager.h => base_file_manager.h}   |   2 +-
 .../base/{BFrame.cpp => base_frame.cpp}       |  20 +-
 .../base/{BFrame.h => base_frame.h}           |   2 +-
 .../base/{BGame.cpp => base_game.cpp}         |  59 +++---
 .../wintermute/base/{BGame.h => base_game.h}  |   6 +-
 ...boardState.cpp => base_keyboard_state.cpp} |   6 +-
 ...BKeyboardState.h => base_keyboard_state.h} |   4 +-
 ...BNamedObject.cpp => base_named_object.cpp} |   2 +-
 .../{BNamedObject.h => base_named_object.h}   |   2 +-
 .../base/{BObject.cpp => base_object.cpp}     |  18 +-
 .../base/{BObject.h => base_object.h}         |   2 +-
 .../base/{BParser.cpp => base_parser.cpp}     |   4 +-
 .../base/{BParser.h => base_parser.h}         |   2 +-
 ...stMgr.cpp => base_persistence_manager.cpp} |  14 +-
 ...ersistMgr.h => base_persistence_manager.h} |   4 +-
 .../base/{BPoint.cpp => base_point.cpp}       |   4 +-
 .../base/{BPoint.h => base_point.h}           |   2 +-
 .../{BQuickMsg.cpp => base_quick_msg.cpp}     |   4 +-
 .../base/{BQuickMsg.h => base_quick_msg.h}    |   2 +-
 .../base/{BRegion.cpp => base_region.cpp}     |  16 +-
 .../base/{BRegion.h => base_region.h}         |   4 +-
 .../base/{BRegistry.cpp => base_registry.cpp} |   8 +-
 .../base/{BRegistry.h => base_registry.h}     |   2 +-
 ...bHelper.cpp => base_save_thumb_helper.cpp} |   4 +-
 ...ThumbHelper.h => base_save_thumb_helper.h} |   2 +-
 ...criptHolder.cpp => base_script_holder.cpp} |  14 +-
 .../{BScriptHolder.h => base_script_holder.h} |   2 +-
 .../{BScriptable.cpp => base_scriptable.cpp}  |   6 +-
 .../base/{BScriptable.h => base_scriptable.h} |   2 +-
 .../base/{BSprite.cpp => base_sprite.cpp}     |  26 +--
 .../base/{BSprite.h => base_sprite.h}         |   2 +-
 ...BStringTable.cpp => base_string_table.cpp} |   8 +-
 .../{BStringTable.h => base_string_table.h}   |   2 +-
 .../{BSubFrame.cpp => base_sub_frame.cpp}     |  16 +-
 .../base/{BSubFrame.h => base_sub_frame.h}    |   4 +-
 ...ceStorage.cpp => base_surface_storage.cpp} |   6 +-
 ...urfaceStorage.h => base_surface_storage.h} |   2 +-
 ...ionMgr.cpp => base_transition_manager.cpp} |   4 +-
 ...nsitionMgr.h => base_transition_manager.h} |   2 +-
 .../base/{BViewport.cpp => base_viewport.cpp} |   4 +-
 .../base/{BViewport.h => base_viewport.h}     |   2 +-
 engines/wintermute/base/file/BPkgFile.cpp     |   6 +-
 engines/wintermute/base/file/BPkgFile.h       |   5 +-
 .../{BDiskFile.cpp => base_disk_file.cpp}     |   6 +-
 .../file/{BDiskFile.h => base_disk_file.h}    |   0
 .../base/file/{BFile.cpp => base_file.cpp}    |   2 +-
 .../base/file/{BFile.h => base_file.h}        |   2 +-
 .../{BFileEntry.cpp => base_file_entry.cpp}   |   2 +-
 .../file/{BFileEntry.h => base_file_entry.h}  |   2 +-
 .../file/{BPackage.cpp => base_package.cpp}   |   6 +-
 .../base/file/{BPackage.h => base_package.h}  |   2 +-
 .../base_resources.cpp}                       |   2 +-
 .../{BResources.h => file/base_resources.h}   |   0
 ...ThumbFile.cpp => base_save_thumb_file.cpp} |   4 +-
 ...SaveThumbFile.h => base_save_thumb_file.h} |   2 +-
 .../base/font/{BFont.cpp => base_font.cpp}    |  12 +-
 .../base/font/{BFont.h => base_font.h}        |   2 +-
 .../{BFontBitmap.cpp => base_font_bitmap.cpp} |  18 +-
 .../{BFontBitmap.h => base_font_bitmap.h}     |   2 +-
 ...BFontStorage.cpp => base_font_storage.cpp} |   6 +-
 .../{BFontStorage.h => base_font_storage.h}   |   2 +-
 .../{BFontTT.cpp => base_font_truetype.cpp}   |  16 +-
 .../font/{BFontTT.h => base_font_truetype.h}  |   4 +-
 engines/wintermute/base/gfx/base_image.cpp    |   8 +-
 engines/wintermute/base/gfx/base_image.h      |   2 +-
 engines/wintermute/base/gfx/base_renderer.cpp |   6 +-
 engines/wintermute/base/gfx/base_renderer.h   |   2 +-
 engines/wintermute/base/gfx/base_surface.cpp  |   2 +-
 engines/wintermute/base/gfx/base_surface.h    |   4 +-
 .../base/gfx/osystem/base_render_osystem.cpp  |  12 +-
 .../base/gfx/osystem/base_surface_osystem.cpp |   8 +-
 .../{PartEmitter.cpp => part_emitter.cpp}     |  16 +-
 .../{PartEmitter.h => part_emitter.h}         |   4 +-
 .../{PartForce.cpp => part_force.cpp}         |   4 +-
 .../particles/{PartForce.h => part_force.h}   |   6 +-
 .../{PartParticle.cpp => part_particle.cpp}   |   8 +-
 .../{PartParticle.h => part_particle.h}       |   6 +-
 .../scriptables/{ScScript.cpp => script.cpp}  |  10 +-
 .../base/scriptables/{ScScript.h => script.h} |   2 +-
 .../{ScEngine.cpp => script_engine.cpp}       |  20 +-
 .../{ScEngine.h => script_engine.h}           |   2 +-
 .../{SXArray.cpp => script_ext_array.cpp}     |   8 +-
 .../{SXArray.h => script_ext_array.h}         |   2 +-
 .../{SXDate.cpp => script_ext_date.cpp}       |   6 +-
 .../{SXDate.h => script_ext_date.h}           |   2 +-
 .../{SXFile.cpp => script_ext_file.cpp}       |  18 +-
 .../{SXFile.h => script_ext_file.h}           |   2 +-
 .../{SXMath.cpp => script_ext_math.cpp}       |   6 +-
 .../{SXMath.h => script_ext_math.h}           |   2 +-
 ...emBuffer.cpp => script_ext_mem_buffer.cpp} |  10 +-
 ...{SXMemBuffer.h => script_ext_mem_buffer.h} |   2 +-
 .../{SxObject.cpp => script_ext_object.cpp}   |   6 +-
 .../{SxObject.h => script_ext_object.h}       |   2 +-
 .../{SXString.cpp => script_ext_string.cpp}   |  12 +-
 .../{SXString.h => script_ext_string.h}       |   2 +-
 .../{ScStack.cpp => script_stack.cpp}         |   6 +-
 .../scriptables/{ScStack.h => script_stack.h} |   2 +-
 .../{ScValue.cpp => script_value.cpp}         |  12 +-
 .../scriptables/{ScValue.h => script_value.h} |   2 +-
 .../base/{BSound.cpp => sound/base_sound.cpp} |   8 +-
 .../base/{BSound.h => sound/base_sound.h}     |   2 +-
 .../base_sound_buffer.cpp}                    |  10 +-
 .../base_sound_buffer.h}                      |   2 +-
 .../base_sound_manager.cpp}                   |  14 +-
 .../base_sound_manager.h}                     |   2 +-
 engines/wintermute/coll_templ.h               |   4 +-
 engines/wintermute/detection.cpp              |   2 +-
 ...entSurface.cpp => transparent_surface.cpp} |   2 +-
 ...sparentSurface.h => transparent_surface.h} |   0
 .../math/{MathUtil.cpp => math_util.cpp}      |   2 +-
 .../math/{MathUtil.h => math_util.h}          |   0
 .../math/{Matrix4.cpp => matrix4.cpp}         |   4 +-
 .../wintermute/math/{Matrix4.h => matrix4.h}  |   0
 .../wintermute/math/{Rect32.h => rect32.h}    |   0
 .../math/{Vector2.cpp => vector2.cpp}         |   2 +-
 .../wintermute/math/{Vector2.h => vector2.h}  |   0
 engines/wintermute/module.mk                  | 196 +++++++++---------
 engines/wintermute/persistent.cpp             | 122 +++++------
 engines/wintermute/persistent.h               |   2 +-
 engines/wintermute/platform_osystem.cpp       |  10 +-
 engines/wintermute/platform_osystem.h         |   2 +-
 .../system/{SysClass.cpp => sys_class.cpp}    |  10 +-
 .../system/{SysClass.h => sys_class.h}        |   0
 ...assRegistry.cpp => sys_class_registry.cpp} |   8 +-
 ...ysClassRegistry.h => sys_class_registry.h} |   2 +-
 .../{SysInstance.cpp => sys_instance.cpp}     |   6 +-
 .../system/{SysInstance.h => sys_instance.h}  |   0
 .../ui/{UIButton.cpp => ui_button.cpp}        |  28 +--
 .../wintermute/ui/{UIButton.h => ui_button.h} |   2 +-
 .../wintermute/ui/{UIEdit.cpp => ui_edit.cpp} |  34 +--
 engines/wintermute/ui/{UIEdit.h => ui_edit.h} |   2 +-
 .../ui/{UIEntity.cpp => ui_entity.cpp}        |  18 +-
 .../wintermute/ui/{UIEntity.h => ui_entity.h} |   2 +-
 .../ui/{UIObject.cpp => ui_object.cpp}        |  16 +-
 .../wintermute/ui/{UIObject.h => ui_object.h} |   2 +-
 .../wintermute/ui/{UIText.cpp => ui_text.cpp} |  26 +--
 engines/wintermute/ui/{UIText.h => ui_text.h} |   2 +-
 .../{UITiledImage.cpp => ui_tiled_image.cpp}  |  12 +-
 .../ui/{UITiledImage.h => ui_tiled_image.h}   |   2 +-
 .../ui/{UIWindow.cpp => ui_window.cpp}        |  38 ++--
 .../wintermute/ui/{UIWindow.h => ui_window.h} |   2 +-
 .../utils/{ConvertUTF.cpp => convert_utf.cpp} |   2 +-
 .../utils/{ConvertUTF.h => convert_utf.h}     |   0
 engines/wintermute/utils/crc.cpp              |   2 +-
 .../utils/{PathUtil.cpp => path_util.cpp}     |   4 +-
 .../utils/{PathUtil.h => path_util.h}         |   0
 .../utils/{StringUtil.cpp => string_util.cpp} |   4 +-
 .../utils/{StringUtil.h => string_util.h}     |   0
 engines/wintermute/utils/utils.cpp            |   6 +-
 engines/wintermute/utils/utils.h              |   2 +-
 .../video/{VidPlayer.cpp => video_player.cpp} |   2 +-
 .../video/{VidPlayer.h => video_player.h}     |   2 +-
 ...eoraPlayer.cpp => video_theora_player.cpp} |  10 +-
 ...idTheoraPlayer.h => video_theora_player.h} |   4 +-
 engines/wintermute/wintermute.cpp             |   8 +-
 219 files changed, 947 insertions(+), 943 deletions(-)
 rename engines/wintermute/ad/{AdActor.cpp => ad_actor.cpp} (94%)
 rename engines/wintermute/ad/{AdActor.h => ad_actor.h} (91%)
 rename engines/wintermute/ad/{AdEntity.cpp => ad_entity.cpp} (93%)
 rename engines/wintermute/ad/{AdEntity.h => ad_entity.h} (94%)
 rename engines/wintermute/ad/{AdGame.cpp => ad_game.cpp} (94%)
 rename engines/wintermute/ad/{AdGame.h => ad_game.h} (95%)
 rename engines/wintermute/ad/{AdInventory.cpp => ad_inventory.cpp} (93%)
 rename engines/wintermute/ad/{AdInventory.h => ad_inventory.h} (93%)
 rename engines/wintermute/ad/{AdInventoryBox.cpp => ad_inventory_box.cpp} (91%)
 rename engines/wintermute/ad/{AdInventoryBox.h => ad_inventory_box.h} (94%)
 rename engines/wintermute/ad/{AdItem.cpp => ad_item.cpp} (93%)
 rename engines/wintermute/ad/{AdItem.h => ad_item.h} (94%)
 rename engines/wintermute/ad/{AdLayer.cpp => ad_layer.cpp} (93%)
 rename engines/wintermute/ad/{AdLayer.h => ad_layer.h} (100%)
 rename engines/wintermute/ad/{AdNodeState.cpp => ad_node_state.cpp} (92%)
 rename engines/wintermute/ad/{AdNodeState.h => ad_node_state.h} (100%)
 rename engines/wintermute/ad/{AdObject.cpp => ad_object.cpp} (93%)
 rename engines/wintermute/ad/{AdObject.h => ad_object.h} (94%)
 rename engines/wintermute/ad/{AdPath.cpp => ad_path.cpp} (93%)
 rename engines/wintermute/ad/{AdPath.h => ad_path.h} (94%)
 rename engines/wintermute/ad/{AdPathPoint.cpp => ad_path_point.cpp} (91%)
 rename engines/wintermute/ad/{AdPathPoint.h => ad_path_point.h} (93%)
 rename engines/wintermute/ad/{AdRegion.cpp => ad_region.cpp} (93%)
 rename engines/wintermute/ad/{AdRegion.h => ad_region.h} (94%)
 rename engines/wintermute/ad/{AdResponse.cpp => ad_response.cpp} (92%)
 rename engines/wintermute/ad/{AdResponse.h => ad_response.h} (91%)
 rename engines/wintermute/ad/{AdResponseBox.cpp => ad_response_box.cpp} (92%)
 rename engines/wintermute/ad/{AdResponseBox.h => ad_response_box.h} (94%)
 rename engines/wintermute/ad/{AdResponseContext.cpp => ad_response_context.cpp} (91%)
 rename engines/wintermute/ad/{AdResponseContext.h => ad_response_context.h} (94%)
 rename engines/wintermute/ad/{AdRotLevel.cpp => ad_rot_level.cpp} (89%)
 rename engines/wintermute/ad/{AdRotLevel.h => ad_rot_level.h} (93%)
 rename engines/wintermute/ad/{AdScaleLevel.cpp => ad_scale_level.cpp} (90%)
 rename engines/wintermute/ad/{AdScaleLevel.h => ad_scale_level.h} (93%)
 rename engines/wintermute/ad/{AdScene.cpp => ad_scene.cpp} (95%)
 rename engines/wintermute/ad/{AdScene.h => ad_scene.h} (96%)
 rename engines/wintermute/ad/{AdSceneNode.cpp => ad_scene_node.cpp} (92%)
 rename engines/wintermute/ad/{AdSceneNode.h => ad_scene_node.h} (86%)
 rename engines/wintermute/ad/{AdSceneState.cpp => ad_scene_state.cpp} (93%)
 rename engines/wintermute/ad/{AdSceneState.h => ad_scene_state.h} (94%)
 rename engines/wintermute/ad/{AdSentence.cpp => ad_sentence.cpp} (90%)
 rename engines/wintermute/ad/{AdSentence.h => ad_sentence.h} (92%)
 rename engines/wintermute/ad/{AdSpriteSet.cpp => ad_sprite_set.cpp} (93%)
 rename engines/wintermute/ad/{AdSpriteSet.h => ad_sprite_set.h} (91%)
 rename engines/wintermute/ad/{AdTalkDef.cpp => ad_talk_def.cpp} (91%)
 rename engines/wintermute/ad/{AdTalkDef.h => ad_talk_def.h} (94%)
 rename engines/wintermute/ad/{AdTalkHolder.cpp => ad_talk_holder.cpp} (93%)
 rename engines/wintermute/ad/{AdTalkHolder.h => ad_talk_holder.h} (94%)
 rename engines/wintermute/ad/{AdTalkNode.cpp => ad_talk_node.cpp} (92%)
 rename engines/wintermute/ad/{AdTalkNode.h => ad_talk_node.h} (94%)
 rename engines/wintermute/ad/{AdTypes.h => ad_types.h} (100%)
 rename engines/wintermute/ad/{AdWaypointGroup.cpp => ad_waypoint_group.cpp} (91%)
 rename engines/wintermute/ad/{AdWaypointGroup.h => ad_waypoint_group.h} (94%)
 rename engines/wintermute/base/{BBase.cpp => base.cpp} (92%)
 rename engines/wintermute/base/{BBase.h => base.h} (100%)
 rename engines/wintermute/base/{BActiveRect.cpp => base_active_rect.cpp} (92%)
 rename engines/wintermute/base/{BActiveRect.h => base_active_rect.h} (92%)
 rename engines/wintermute/base/{BDebugger.cpp => base_debugger.cpp} (96%)
 rename engines/wintermute/base/{BDebugger.h => base_debugger.h} (95%)
 rename engines/wintermute/base/{BDynBuffer.cpp => base_dynamic_buffer.cpp} (94%)
 rename engines/wintermute/base/{BDynBuffer.h => base_dynamic_buffer.h} (94%)
 rename engines/wintermute/base/{BFader.cpp => base_fader.cpp} (94%)
 rename engines/wintermute/base/{BFader.h => base_fader.h} (93%)
 rename engines/wintermute/base/{BFileManager.cpp => base_file_manager.cpp} (94%)
 rename engines/wintermute/base/{BFileManager.h => base_file_manager.h} (95%)
 rename engines/wintermute/base/{BFrame.cpp => base_frame.cpp} (94%)
 rename engines/wintermute/base/{BFrame.h => base_frame.h} (95%)
 rename engines/wintermute/base/{BGame.cpp => base_game.cpp} (95%)
 rename engines/wintermute/base/{BGame.h => base_game.h} (95%)
 rename engines/wintermute/base/{BKeyboardState.cpp => base_keyboard_state.cpp} (94%)
 rename engines/wintermute/base/{BKeyboardState.h => base_keyboard_state.h} (92%)
 rename engines/wintermute/base/{BNamedObject.cpp => base_named_object.cpp} (94%)
 rename engines/wintermute/base/{BNamedObject.h => base_named_object.h} (93%)
 rename engines/wintermute/base/{BObject.cpp => base_object.cpp} (95%)
 rename engines/wintermute/base/{BObject.h => base_object.h} (95%)
 rename engines/wintermute/base/{BParser.cpp => base_parser.cpp} (95%)
 rename engines/wintermute/base/{BParser.h => base_parser.h} (95%)
 rename engines/wintermute/base/{BPersistMgr.cpp => base_persistence_manager.cpp} (94%)
 rename engines/wintermute/base/{BPersistMgr.h => base_persistence_manager.h} (94%)
 rename engines/wintermute/base/{BPoint.cpp => base_point.cpp} (91%)
 rename engines/wintermute/base/{BPoint.h => base_point.h} (93%)
 rename engines/wintermute/base/{BQuickMsg.cpp => base_quick_msg.cpp} (91%)
 rename engines/wintermute/base/{BQuickMsg.h => base_quick_msg.h} (93%)
 rename engines/wintermute/base/{BRegion.cpp => base_region.cpp} (93%)
 rename engines/wintermute/base/{BRegion.h => base_region.h} (92%)
 rename engines/wintermute/base/{BRegistry.cpp => base_registry.cpp} (94%)
 rename engines/wintermute/base/{BRegistry.h => base_registry.h} (95%)
 rename engines/wintermute/base/{BSaveThumbHelper.cpp => base_save_thumb_helper.cpp} (92%)
 rename engines/wintermute/base/{BSaveThumbHelper.h => base_save_thumb_helper.h} (93%)
 rename engines/wintermute/base/{BScriptHolder.cpp => base_script_holder.cpp} (93%)
 rename engines/wintermute/base/{BScriptHolder.h => base_script_holder.h} (95%)
 rename engines/wintermute/base/{BScriptable.cpp => base_scriptable.cpp} (93%)
 rename engines/wintermute/base/{BScriptable.h => base_scriptable.h} (95%)
 rename engines/wintermute/base/{BSprite.cpp => base_sprite.cpp} (93%)
 rename engines/wintermute/base/{BSprite.h => base_sprite.h} (95%)
 rename engines/wintermute/base/{BStringTable.cpp => base_string_table.cpp} (93%)
 rename engines/wintermute/base/{BStringTable.h => base_string_table.h} (94%)
 rename engines/wintermute/base/{BSubFrame.cpp => base_sub_frame.cpp} (94%)
 rename engines/wintermute/base/{BSubFrame.h => base_sub_frame.h} (93%)
 rename engines/wintermute/base/{BSurfaceStorage.cpp => base_surface_storage.cpp} (94%)
 rename engines/wintermute/base/{BSurfaceStorage.h => base_surface_storage.h} (94%)
 rename engines/wintermute/base/{BTransitionMgr.cpp => base_transition_manager.cpp} (93%)
 rename engines/wintermute/base/{BTransitionMgr.h => base_transition_manager.h} (94%)
 rename engines/wintermute/base/{BViewport.cpp => base_viewport.cpp} (93%)
 rename engines/wintermute/base/{BViewport.h => base_viewport.h} (94%)
 rename engines/wintermute/base/file/{BDiskFile.cpp => base_disk_file.cpp} (92%)
 rename engines/wintermute/base/file/{BDiskFile.h => base_disk_file.h} (100%)
 rename engines/wintermute/base/file/{BFile.cpp => base_file.cpp} (94%)
 rename engines/wintermute/base/file/{BFile.h => base_file.h} (94%)
 rename engines/wintermute/base/file/{BFileEntry.cpp => base_file_entry.cpp} (93%)
 rename engines/wintermute/base/file/{BFileEntry.h => base_file_entry.h} (93%)
 rename engines/wintermute/base/file/{BPackage.cpp => base_package.cpp} (92%)
 rename engines/wintermute/base/file/{BPackage.h => base_package.h} (94%)
 rename engines/wintermute/base/{BResources.cpp => file/base_resources.cpp} (98%)
 rename engines/wintermute/base/{BResources.h => file/base_resources.h} (100%)
 rename engines/wintermute/base/file/{BSaveThumbFile.cpp => base_save_thumb_file.cpp} (93%)
 rename engines/wintermute/base/file/{BSaveThumbFile.h => base_save_thumb_file.h} (93%)
 rename engines/wintermute/base/font/{BFont.cpp => base_font.cpp} (90%)
 rename engines/wintermute/base/font/{BFont.h => base_font.h} (94%)
 rename engines/wintermute/base/font/{BFontBitmap.cpp => base_font_bitmap.cpp} (93%)
 rename engines/wintermute/base/font/{BFontBitmap.h => base_font_bitmap.h} (94%)
 rename engines/wintermute/base/font/{BFontStorage.cpp => base_font_storage.cpp} (92%)
 rename engines/wintermute/base/font/{BFontStorage.h => base_font_storage.h} (94%)
 rename engines/wintermute/base/font/{BFontTT.cpp => base_font_truetype.cpp} (94%)
 rename engines/wintermute/base/font/{BFontTT.h => base_font_truetype.h} (93%)
 rename engines/wintermute/base/particles/{PartEmitter.cpp => part_emitter.cpp} (95%)
 rename engines/wintermute/base/particles/{PartEmitter.h => part_emitter.h} (93%)
 rename engines/wintermute/base/particles/{PartForce.cpp => part_force.cpp} (91%)
 rename engines/wintermute/base/particles/{PartForce.h => part_force.h} (88%)
 rename engines/wintermute/base/particles/{PartParticle.cpp => part_particle.cpp} (93%)
 rename engines/wintermute/base/particles/{PartParticle.h => part_particle.h} (90%)
 rename engines/wintermute/base/scriptables/{ScScript.cpp => script.cpp} (95%)
 rename engines/wintermute/base/scriptables/{ScScript.h => script.h} (95%)
 rename engines/wintermute/base/scriptables/{ScEngine.cpp => script_engine.cpp} (93%)
 rename engines/wintermute/base/scriptables/{ScEngine.h => script_engine.h} (95%)
 rename engines/wintermute/base/scriptables/{SXArray.cpp => script_ext_array.cpp} (93%)
 rename engines/wintermute/base/scriptables/{SXArray.h => script_ext_array.h} (94%)
 rename engines/wintermute/base/scriptables/{SXDate.cpp => script_ext_date.cpp} (94%)
 rename engines/wintermute/base/scriptables/{SXDate.h => script_ext_date.h} (94%)
 rename engines/wintermute/base/scriptables/{SXFile.cpp => script_ext_file.cpp} (94%)
 rename engines/wintermute/base/scriptables/{SXFile.h => script_ext_file.h} (94%)
 rename engines/wintermute/base/scriptables/{SXMath.cpp => script_ext_math.cpp} (95%)
 rename engines/wintermute/base/scriptables/{SXMath.h => script_ext_math.h} (93%)
 rename engines/wintermute/base/scriptables/{SXMemBuffer.cpp => script_ext_mem_buffer.cpp} (94%)
 rename engines/wintermute/base/scriptables/{SXMemBuffer.h => script_ext_mem_buffer.h} (94%)
 rename engines/wintermute/base/scriptables/{SxObject.cpp => script_ext_object.cpp} (88%)
 rename engines/wintermute/base/scriptables/{SxObject.h => script_ext_object.h} (93%)
 rename engines/wintermute/base/scriptables/{SXString.cpp => script_ext_string.cpp} (93%)
 rename engines/wintermute/base/scriptables/{SXString.h => script_ext_string.h} (94%)
 rename engines/wintermute/base/scriptables/{ScStack.cpp => script_stack.cpp} (93%)
 rename engines/wintermute/base/scriptables/{ScStack.h => script_stack.h} (94%)
 rename engines/wintermute/base/scriptables/{ScValue.cpp => script_value.cpp} (94%)
 rename engines/wintermute/base/scriptables/{ScValue.h => script_value.h} (95%)
 rename engines/wintermute/base/{BSound.cpp => sound/base_sound.cpp} (93%)
 rename engines/wintermute/base/{BSound.h => sound/base_sound.h} (95%)
 rename engines/wintermute/base/{BSoundBuffer.cpp => sound/base_sound_buffer.cpp} (94%)
 rename engines/wintermute/base/{BSoundBuffer.h => sound/base_sound_buffer.h} (94%)
 rename engines/wintermute/base/{BSoundMgr.cpp => sound/base_sound_manager.cpp} (91%)
 rename engines/wintermute/base/{BSoundMgr.h => sound/base_sound_manager.h} (95%)
 rename engines/wintermute/graphics/{transparentSurface.cpp => transparent_surface.cpp} (99%)
 rename engines/wintermute/graphics/{transparentSurface.h => transparent_surface.h} (100%)
 rename engines/wintermute/math/{MathUtil.cpp => math_util.cpp} (94%)
 rename engines/wintermute/math/{MathUtil.h => math_util.h} (100%)
 rename engines/wintermute/math/{Matrix4.cpp => matrix4.cpp} (92%)
 rename engines/wintermute/math/{Matrix4.h => matrix4.h} (100%)
 rename engines/wintermute/math/{Rect32.h => rect32.h} (100%)
 rename engines/wintermute/math/{Vector2.cpp => vector2.cpp} (94%)
 rename engines/wintermute/math/{Vector2.h => vector2.h} (100%)
 rename engines/wintermute/system/{SysClass.cpp => sys_class.cpp} (93%)
 rename engines/wintermute/system/{SysClass.h => sys_class.h} (100%)
 rename engines/wintermute/system/{SysClassRegistry.cpp => sys_class_registry.cpp} (94%)
 rename engines/wintermute/system/{SysClassRegistry.h => sys_class_registry.h} (95%)
 rename engines/wintermute/system/{SysInstance.cpp => sys_instance.cpp} (87%)
 rename engines/wintermute/system/{SysInstance.h => sys_instance.h} (100%)
 rename engines/wintermute/ui/{UIButton.cpp => ui_button.cpp} (94%)
 rename engines/wintermute/ui/{UIButton.h => ui_button.h} (95%)
 rename engines/wintermute/ui/{UIEdit.cpp => ui_edit.cpp} (93%)
 rename engines/wintermute/ui/{UIEdit.h => ui_edit.h} (95%)
 rename engines/wintermute/ui/{UIEntity.cpp => ui_entity.cpp} (91%)
 rename engines/wintermute/ui/{UIEntity.h => ui_entity.h} (94%)
 rename engines/wintermute/ui/{UIObject.cpp => ui_object.cpp} (94%)
 rename engines/wintermute/ui/{UIObject.h => ui_object.h} (95%)
 rename engines/wintermute/ui/{UIText.cpp => ui_text.cpp} (91%)
 rename engines/wintermute/ui/{UIText.h => ui_text.h} (94%)
 rename engines/wintermute/ui/{UITiledImage.cpp => ui_tiled_image.cpp} (94%)
 rename engines/wintermute/ui/{UITiledImage.h => ui_tiled_image.h} (94%)
 rename engines/wintermute/ui/{UIWindow.cpp => ui_window.cpp} (94%)
 rename engines/wintermute/ui/{UIWindow.h => ui_window.h} (95%)
 rename engines/wintermute/utils/{ConvertUTF.cpp => convert_utf.cpp} (99%)
 rename engines/wintermute/utils/{ConvertUTF.h => convert_utf.h} (100%)
 rename engines/wintermute/utils/{PathUtil.cpp => path_util.cpp} (95%)
 rename engines/wintermute/utils/{PathUtil.h => path_util.h} (100%)
 rename engines/wintermute/utils/{StringUtil.cpp => string_util.cpp} (96%)
 rename engines/wintermute/utils/{StringUtil.h => string_util.h} (100%)
 rename engines/wintermute/video/{VidPlayer.cpp => video_player.cpp} (99%)
 rename engines/wintermute/video/{VidPlayer.h => video_player.h} (98%)
 rename engines/wintermute/video/{VidTheoraPlayer.cpp => video_theora_player.cpp} (98%)
 rename engines/wintermute/video/{VidTheoraPlayer.h => video_theora_player.h} (97%)

diff --git a/engines/wintermute/ad/AdActor.cpp b/engines/wintermute/ad/ad_actor.cpp
similarity index 94%
rename from engines/wintermute/ad/AdActor.cpp
rename to engines/wintermute/ad/ad_actor.cpp
index 050a419e53e..36f1aa82869 100644
--- a/engines/wintermute/ad/AdActor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -29,23 +29,23 @@
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/dctypes.h"
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/ad/AdActor.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdScene.h"
-#include "engines/wintermute/ad/AdEntity.h"
-#include "engines/wintermute/ad/AdSpriteSet.h"
-#include "engines/wintermute/ad/AdWaypointGroup.h"
-#include "engines/wintermute/ad/AdPath.h"
-#include "engines/wintermute/ad/AdSentence.h"
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/ad/ad_actor.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_scene.h"
+#include "engines/wintermute/ad/ad_entity.h"
+#include "engines/wintermute/ad/ad_sprite_set.h"
+#include "engines/wintermute/ad/ad_waypoint_group.h"
+#include "engines/wintermute/ad/ad_path.h"
+#include "engines/wintermute/ad/ad_sentence.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "engines/wintermute/wintermute.h"
diff --git a/engines/wintermute/ad/AdActor.h b/engines/wintermute/ad/ad_actor.h
similarity index 91%
rename from engines/wintermute/ad/AdActor.h
rename to engines/wintermute/ad/ad_actor.h
index 1be8b8131d3..ca79f638d9e 100644
--- a/engines/wintermute/ad/AdActor.h
+++ b/engines/wintermute/ad/ad_actor.h
@@ -31,9 +31,9 @@
 
 
 #include "engines/wintermute/dctypes.h"    // Added by ClassView
-#include "engines/wintermute/ad/AdTypes.h"    // Added by ClassView
-#include "engines/wintermute/ad/AdTalkHolder.h"
-#include "engines/wintermute/base/BPoint.h" // Added by ClassView
+#include "engines/wintermute/ad/ad_types.h"    // Added by ClassView
+#include "engines/wintermute/ad/ad_talk_holder.h"
+#include "engines/wintermute/base/base_point.h" // Added by ClassView
 #include "engines/wintermute/persistent.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/ad/AdEntity.cpp b/engines/wintermute/ad/ad_entity.cpp
similarity index 93%
rename from engines/wintermute/ad/AdEntity.cpp
rename to engines/wintermute/ad/ad_entity.cpp
index 49c723f66a7..5f320172645 100644
--- a/engines/wintermute/ad/AdEntity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -29,28 +29,28 @@
 
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdEntity.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdScene.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/ad/AdWaypointGroup.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/ad/AdSentence.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_entity.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/base_surface_storage.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_scene.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/ad/ad_waypoint_group.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/ad/ad_sentence.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "engines/wintermute/utils/utils.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/video/VidTheoraPlayer.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/video/video_theora_player.h"
 #include "common/str.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/ad/AdEntity.h b/engines/wintermute/ad/ad_entity.h
similarity index 94%
rename from engines/wintermute/ad/AdEntity.h
rename to engines/wintermute/ad/ad_entity.h
index a260ca33299..8b67d27c1f3 100644
--- a/engines/wintermute/ad/AdEntity.h
+++ b/engines/wintermute/ad/ad_entity.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADENTITY_H
 #define WINTERMUTE_ADENTITY_H
 
-#include "engines/wintermute/ad/AdTalkHolder.h"
+#include "engines/wintermute/ad/ad_talk_holder.h"
 
 namespace WinterMute {
 class CVidTheoraPlayer;
diff --git a/engines/wintermute/ad/AdGame.cpp b/engines/wintermute/ad/ad_game.cpp
similarity index 94%
rename from engines/wintermute/ad/AdGame.cpp
rename to engines/wintermute/ad/ad_game.cpp
index 87e3fe14d9f..69cda25f299 100644
--- a/engines/wintermute/ad/AdGame.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -27,38 +27,38 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdActor.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdEntity.h"
-#include "engines/wintermute/ad/AdInventory.h"
-#include "engines/wintermute/ad/AdInventoryBox.h"
-#include "engines/wintermute/ad/AdItem.h"
-#include "engines/wintermute/ad/AdResponse.h"
-#include "engines/wintermute/ad/AdResponseBox.h"
-#include "engines/wintermute/ad/AdResponseContext.h"
-#include "engines/wintermute/ad/AdScene.h"
-#include "engines/wintermute/ad/AdSceneState.h"
-#include "engines/wintermute/ad/AdSentence.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
-#include "engines/wintermute/base/BTransitionMgr.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BViewport.h"
-#include "engines/wintermute/base/particles/PartEmitter.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/ui/UIEntity.h"
-#include "engines/wintermute/ui/UIWindow.h"
+#include "engines/wintermute/ad/ad_actor.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_entity.h"
+#include "engines/wintermute/ad/ad_inventory.h"
+#include "engines/wintermute/ad/ad_inventory_box.h"
+#include "engines/wintermute/ad/ad_item.h"
+#include "engines/wintermute/ad/ad_response.h"
+#include "engines/wintermute/ad/ad_response_box.h"
+#include "engines/wintermute/ad/ad_response_context.h"
+#include "engines/wintermute/ad/ad_scene.h"
+#include "engines/wintermute/ad/ad_scene_state.h"
+#include "engines/wintermute/ad/ad_sentence.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/base_surface_storage.h"
+#include "engines/wintermute/base/base_transition_manager.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_viewport.h"
+#include "engines/wintermute/base/particles/part_emitter.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/ui/ui_entity.h"
+#include "engines/wintermute/ui/ui_window.h"
 #include "engines/wintermute/utils/utils.h"
-#include "engines/wintermute/video/VidPlayer.h"
-#include "engines/wintermute/video/VidTheoraPlayer.h"
+#include "engines/wintermute/video/video_player.h"
+#include "engines/wintermute/video/video_theora_player.h"
 #include "common/str.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/ad/AdGame.h b/engines/wintermute/ad/ad_game.h
similarity index 95%
rename from engines/wintermute/ad/AdGame.h
rename to engines/wintermute/ad/ad_game.h
index 4a89fa97d20..09b3e09df04 100644
--- a/engines/wintermute/ad/AdGame.h
+++ b/engines/wintermute/ad/ad_game.h
@@ -28,8 +28,8 @@
 #ifndef WINTERMUTE_ADGAME_H
 #define WINTERMUTE_ADGAME_H
 
-#include "engines/wintermute/ad/AdTypes.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/ad/ad_types.h"
+#include "engines/wintermute/base/base_game.h"
 
 namespace WinterMute {
 class CAdItem;
diff --git a/engines/wintermute/ad/AdInventory.cpp b/engines/wintermute/ad/ad_inventory.cpp
similarity index 93%
rename from engines/wintermute/ad/AdInventory.cpp
rename to engines/wintermute/ad/ad_inventory.cpp
index f9131084043..cfbc9e5029f 100644
--- a/engines/wintermute/ad/AdInventory.cpp
+++ b/engines/wintermute/ad/ad_inventory.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/ad/AdInventory.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdItem.h"
+#include "engines/wintermute/ad/ad_inventory.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_item.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/ad/AdInventory.h b/engines/wintermute/ad/ad_inventory.h
similarity index 93%
rename from engines/wintermute/ad/AdInventory.h
rename to engines/wintermute/ad/ad_inventory.h
index cec76c03a04..84d9308d5dd 100644
--- a/engines/wintermute/ad/AdInventory.h
+++ b/engines/wintermute/ad/ad_inventory.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADINVENTORY_H
 #define WINTERMUTE_ADINVENTORY_H
 
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdInventoryBox.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
similarity index 91%
rename from engines/wintermute/ad/AdInventoryBox.cpp
rename to engines/wintermute/ad/ad_inventory_box.cpp
index 9509bf9b105..abe86763761 100644
--- a/engines/wintermute/ad/AdInventoryBox.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -26,17 +26,17 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdInventoryBox.h"
-#include "engines/wintermute/ad/AdInventory.h"
-#include "engines/wintermute/ad/AdItem.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BViewport.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/ui/UIButton.h"
-#include "engines/wintermute/ui/UIWindow.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_inventory_box.h"
+#include "engines/wintermute/ad/ad_inventory.h"
+#include "engines/wintermute/ad/ad_item.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_viewport.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/ui/ui_button.h"
+#include "engines/wintermute/ui/ui_window.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
 #include "common/rect.h"
diff --git a/engines/wintermute/ad/AdInventoryBox.h b/engines/wintermute/ad/ad_inventory_box.h
similarity index 94%
rename from engines/wintermute/ad/AdInventoryBox.h
rename to engines/wintermute/ad/ad_inventory_box.h
index cfd8d74021c..09d3ef409e4 100644
--- a/engines/wintermute/ad/AdInventoryBox.h
+++ b/engines/wintermute/ad/ad_inventory_box.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADINVENTORYBOX_H
 #define WINTERMUTE_ADINVENTORYBOX_H
 
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
 #include "common/rect.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/ad/AdItem.cpp b/engines/wintermute/ad/ad_item.cpp
similarity index 93%
rename from engines/wintermute/ad/AdItem.cpp
rename to engines/wintermute/ad/ad_item.cpp
index 0e443d5c3ea..9c49a86bcb8 100644
--- a/engines/wintermute/ad/AdItem.cpp
+++ b/engines/wintermute/ad/ad_item.cpp
@@ -27,21 +27,21 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdItem.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdSentence.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/ad/ad_item.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_sentence.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
 #include "common/str.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/ad/AdItem.h b/engines/wintermute/ad/ad_item.h
similarity index 94%
rename from engines/wintermute/ad/AdItem.h
rename to engines/wintermute/ad/ad_item.h
index d45f9cc614b..34b19a830f5 100644
--- a/engines/wintermute/ad/AdItem.h
+++ b/engines/wintermute/ad/ad_item.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADITEM_H
 
 
-#include "engines/wintermute/ad/AdTalkHolder.h"
+#include "engines/wintermute/ad/ad_talk_holder.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdLayer.cpp b/engines/wintermute/ad/ad_layer.cpp
similarity index 93%
rename from engines/wintermute/ad/AdLayer.cpp
rename to engines/wintermute/ad/ad_layer.cpp
index 4549ba4af70..e23948ed87c 100644
--- a/engines/wintermute/ad/AdLayer.cpp
+++ b/engines/wintermute/ad/ad_layer.cpp
@@ -27,15 +27,15 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/ad/AdLayer.h"
-#include "engines/wintermute/ad/AdSceneNode.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/ad/ad_layer.h"
+#include "engines/wintermute/ad/ad_scene_node.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/ad/AdLayer.h b/engines/wintermute/ad/ad_layer.h
similarity index 100%
rename from engines/wintermute/ad/AdLayer.h
rename to engines/wintermute/ad/ad_layer.h
diff --git a/engines/wintermute/ad/AdNodeState.cpp b/engines/wintermute/ad/ad_node_state.cpp
similarity index 92%
rename from engines/wintermute/ad/AdNodeState.cpp
rename to engines/wintermute/ad/ad_node_state.cpp
index fd72a356c53..06f9c4cf957 100644
--- a/engines/wintermute/ad/AdNodeState.cpp
+++ b/engines/wintermute/ad/ad_node_state.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/ad/AdNodeState.h"
-#include "engines/wintermute/ad/AdEntity.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/ad/ad_node_state.h"
+#include "engines/wintermute/ad/ad_entity.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
diff --git a/engines/wintermute/ad/AdNodeState.h b/engines/wintermute/ad/ad_node_state.h
similarity index 100%
rename from engines/wintermute/ad/AdNodeState.h
rename to engines/wintermute/ad/ad_node_state.h
diff --git a/engines/wintermute/ad/AdObject.cpp b/engines/wintermute/ad/ad_object.cpp
similarity index 93%
rename from engines/wintermute/ad/AdObject.cpp
rename to engines/wintermute/ad/ad_object.cpp
index c74c8cf6b33..46f2e590fdb 100644
--- a/engines/wintermute/ad/AdObject.cpp
+++ b/engines/wintermute/ad/ad_object.cpp
@@ -27,28 +27,28 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdItem.h"
-#include "engines/wintermute/ad/AdObject.h"
-#include "engines/wintermute/ad/AdInventory.h"
-#include "engines/wintermute/ad/AdLayer.h"
-#include "engines/wintermute/ad/AdScene.h"
-#include "engines/wintermute/ad/AdSceneNode.h"
-#include "engines/wintermute/ad/AdSentence.h"
-#include "engines/wintermute/ad/AdWaypointGroup.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFrame.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_item.h"
+#include "engines/wintermute/ad/ad_object.h"
+#include "engines/wintermute/ad/ad_inventory.h"
+#include "engines/wintermute/ad/ad_layer.h"
+#include "engines/wintermute/ad/ad_scene.h"
+#include "engines/wintermute/ad/ad_scene_node.h"
+#include "engines/wintermute/ad/ad_sentence.h"
+#include "engines/wintermute/ad/ad_waypoint_group.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_frame.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_surface_storage.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
 #include "common/str.h"
 #include "common/util.h"
 
diff --git a/engines/wintermute/ad/AdObject.h b/engines/wintermute/ad/ad_object.h
similarity index 94%
rename from engines/wintermute/ad/AdObject.h
rename to engines/wintermute/ad/ad_object.h
index d662e84729f..dd123092a3c 100644
--- a/engines/wintermute/ad/AdObject.h
+++ b/engines/wintermute/ad/ad_object.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_ADOBJECT_H
 #define WINTERMUTE_ADOBJECT_H
 
-#include "engines/wintermute/ad/AdTypes.h"
-#include "engines/wintermute/base/particles/PartEmitter.h"
+#include "engines/wintermute/ad/ad_types.h"
+#include "engines/wintermute/base/particles/part_emitter.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdPath.cpp b/engines/wintermute/ad/ad_path.cpp
similarity index 93%
rename from engines/wintermute/ad/AdPath.cpp
rename to engines/wintermute/ad/ad_path.cpp
index d1b9d870638..780912ce08d 100644
--- a/engines/wintermute/ad/AdPath.cpp
+++ b/engines/wintermute/ad/ad_path.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdPath.h"
-#include "engines/wintermute/base/BPoint.h"
+#include "engines/wintermute/ad/ad_path.h"
+#include "engines/wintermute/base/base_point.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdPath.h b/engines/wintermute/ad/ad_path.h
similarity index 94%
rename from engines/wintermute/ad/AdPath.h
rename to engines/wintermute/ad/ad_path.h
index fdc29800429..f27362bfd91 100644
--- a/engines/wintermute/ad/AdPath.h
+++ b/engines/wintermute/ad/ad_path.h
@@ -31,7 +31,7 @@
 
 #include "engines/wintermute/persistent.h"
 #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 
 namespace WinterMute {
 class CBPoint;
diff --git a/engines/wintermute/ad/AdPathPoint.cpp b/engines/wintermute/ad/ad_path_point.cpp
similarity index 91%
rename from engines/wintermute/ad/AdPathPoint.cpp
rename to engines/wintermute/ad/ad_path_point.cpp
index 184ad8559a8..d4b910a30f7 100644
--- a/engines/wintermute/ad/AdPathPoint.cpp
+++ b/engines/wintermute/ad/ad_path_point.cpp
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/ad/AdPathPoint.h"
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/ad/ad_path_point.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdPathPoint.h b/engines/wintermute/ad/ad_path_point.h
similarity index 93%
rename from engines/wintermute/ad/AdPathPoint.h
rename to engines/wintermute/ad/ad_path_point.h
index f58df765b13..2a58237bb91 100644
--- a/engines/wintermute/ad/AdPathPoint.h
+++ b/engines/wintermute/ad/ad_path_point.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADPATHPOINT_H
 
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/BPoint.h"
+#include "engines/wintermute/base/base_point.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdRegion.cpp b/engines/wintermute/ad/ad_region.cpp
similarity index 93%
rename from engines/wintermute/ad/AdRegion.cpp
rename to engines/wintermute/ad/ad_region.cpp
index a1864de1ac1..ae65be5013c 100644
--- a/engines/wintermute/ad/AdRegion.cpp
+++ b/engines/wintermute/ad/ad_region.cpp
@@ -27,13 +27,13 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdRegion.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_region.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdRegion.h b/engines/wintermute/ad/ad_region.h
similarity index 94%
rename from engines/wintermute/ad/AdRegion.h
rename to engines/wintermute/ad/ad_region.h
index c91feb40122..62c5fd6ba31 100644
--- a/engines/wintermute/ad/AdRegion.h
+++ b/engines/wintermute/ad/ad_region.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADREGION_H
 #define WINTERMUTE_ADREGION_H
 
-#include "engines/wintermute/base/BRegion.h"
+#include "engines/wintermute/base/base_region.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdResponse.cpp b/engines/wintermute/ad/ad_response.cpp
similarity index 92%
rename from engines/wintermute/ad/AdResponse.cpp
rename to engines/wintermute/ad/ad_response.cpp
index 20617f9573c..b653fbd36ae 100644
--- a/engines/wintermute/ad/AdResponse.cpp
+++ b/engines/wintermute/ad/ad_response.cpp
@@ -27,10 +27,10 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdResponse.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/ad/ad_response.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/utils/utils.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/ad/AdResponse.h b/engines/wintermute/ad/ad_response.h
similarity index 91%
rename from engines/wintermute/ad/AdResponse.h
rename to engines/wintermute/ad/ad_response.h
index 646d781b891..da450b22290 100644
--- a/engines/wintermute/ad/AdResponse.h
+++ b/engines/wintermute/ad/ad_response.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_ADRESPONSE_H
 
 
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/ad/AdTypes.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/ad/ad_types.h"
 
 namespace WinterMute {
 class CBFont;
diff --git a/engines/wintermute/ad/AdResponseBox.cpp b/engines/wintermute/ad/ad_response_box.cpp
similarity index 92%
rename from engines/wintermute/ad/AdResponseBox.cpp
rename to engines/wintermute/ad/ad_response_box.cpp
index 829d58f2eed..2499c9a732f 100644
--- a/engines/wintermute/ad/AdResponseBox.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -27,20 +27,20 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdResponseBox.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
-#include "engines/wintermute/ui/UIButton.h"
-#include "engines/wintermute/ui/UIWindow.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/ad/AdResponse.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_response_box.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_surface_storage.h"
+#include "engines/wintermute/ui/ui_button.h"
+#include "engines/wintermute/ui/ui_window.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/ad/ad_response.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
diff --git a/engines/wintermute/ad/AdResponseBox.h b/engines/wintermute/ad/ad_response_box.h
similarity index 94%
rename from engines/wintermute/ad/AdResponseBox.h
rename to engines/wintermute/ad/ad_response_box.h
index 93b677bd4a3..7c611ef2d64 100644
--- a/engines/wintermute/ad/AdResponseBox.h
+++ b/engines/wintermute/ad/ad_response_box.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADRESPONSEBOX_H
 
 
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdResponseContext.cpp b/engines/wintermute/ad/ad_response_context.cpp
similarity index 91%
rename from engines/wintermute/ad/AdResponseContext.cpp
rename to engines/wintermute/ad/ad_response_context.cpp
index 8573e58b95a..02b819d6dea 100644
--- a/engines/wintermute/ad/AdResponseContext.cpp
+++ b/engines/wintermute/ad/ad_response_context.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdResponseContext.h"
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/ad/ad_response_context.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdResponseContext.h b/engines/wintermute/ad/ad_response_context.h
similarity index 94%
rename from engines/wintermute/ad/AdResponseContext.h
rename to engines/wintermute/ad/ad_response_context.h
index 74506405ded..79eaa27640a 100644
--- a/engines/wintermute/ad/AdResponseContext.h
+++ b/engines/wintermute/ad/ad_response_context.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADRESPONSECONTEXT_H
 
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdRotLevel.cpp b/engines/wintermute/ad/ad_rot_level.cpp
similarity index 89%
rename from engines/wintermute/ad/AdRotLevel.cpp
rename to engines/wintermute/ad/ad_rot_level.cpp
index 671d003f352..0ffbaf69199 100644
--- a/engines/wintermute/ad/AdRotLevel.cpp
+++ b/engines/wintermute/ad/ad_rot_level.cpp
@@ -27,12 +27,12 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdRotLevel.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_rot_level.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdRotLevel.h b/engines/wintermute/ad/ad_rot_level.h
similarity index 93%
rename from engines/wintermute/ad/AdRotLevel.h
rename to engines/wintermute/ad/ad_rot_level.h
index 9e536a8d8fb..2bd9519d653 100644
--- a/engines/wintermute/ad/AdRotLevel.h
+++ b/engines/wintermute/ad/ad_rot_level.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADROTLEVEL_H
 #define WINTERMUTE_ADROTLEVEL_H
 
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdScaleLevel.cpp b/engines/wintermute/ad/ad_scale_level.cpp
similarity index 90%
rename from engines/wintermute/ad/AdScaleLevel.cpp
rename to engines/wintermute/ad/ad_scale_level.cpp
index 1ac2f7ba6ca..220d3c4b397 100644
--- a/engines/wintermute/ad/AdScaleLevel.cpp
+++ b/engines/wintermute/ad/ad_scale_level.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdScaleLevel.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_scale_level.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdScaleLevel.h b/engines/wintermute/ad/ad_scale_level.h
similarity index 93%
rename from engines/wintermute/ad/AdScaleLevel.h
rename to engines/wintermute/ad/ad_scale_level.h
index c360ec4eff3..4a81c00dda7 100644
--- a/engines/wintermute/ad/AdScaleLevel.h
+++ b/engines/wintermute/ad/ad_scale_level.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADSCALELEVEL_H
 
 
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdScene.cpp b/engines/wintermute/ad/ad_scene.cpp
similarity index 95%
rename from engines/wintermute/ad/AdScene.cpp
rename to engines/wintermute/ad/ad_scene.cpp
index b284543a08c..11030d69969 100644
--- a/engines/wintermute/ad/AdScene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -26,37 +26,37 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/ad/AdScene.h"
-#include "engines/wintermute/ad/AdActor.h"
-#include "engines/wintermute/ad/AdEntity.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdLayer.h"
-#include "engines/wintermute/ad/AdNodeState.h"
-#include "engines/wintermute/ad/AdObject.h"
-#include "engines/wintermute/ad/AdPath.h"
-#include "engines/wintermute/ad/AdPathPoint.h"
-#include "engines/wintermute/ad/AdRotLevel.h"
-#include "engines/wintermute/ad/AdScaleLevel.h"
-#include "engines/wintermute/ad/AdSceneNode.h"
-#include "engines/wintermute/ad/AdSceneState.h"
-#include "engines/wintermute/ad/AdSentence.h"
-#include "engines/wintermute/ad/AdWaypointGroup.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BPoint.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BScriptable.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BViewport.h"
+#include "engines/wintermute/ad/ad_scene.h"
+#include "engines/wintermute/ad/ad_actor.h"
+#include "engines/wintermute/ad/ad_entity.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_layer.h"
+#include "engines/wintermute/ad/ad_node_state.h"
+#include "engines/wintermute/ad/ad_object.h"
+#include "engines/wintermute/ad/ad_path.h"
+#include "engines/wintermute/ad/ad_path_point.h"
+#include "engines/wintermute/ad/ad_rot_level.h"
+#include "engines/wintermute/ad/ad_scale_level.h"
+#include "engines/wintermute/ad/ad_scene_node.h"
+#include "engines/wintermute/ad/ad_scene_state.h"
+#include "engines/wintermute/ad/ad_sentence.h"
+#include "engines/wintermute/ad/ad_waypoint_group.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_point.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_scriptable.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_viewport.h"
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/ui/UIWindow.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/ui/ui_window.h"
 #include "engines/wintermute/utils/utils.h"
 #include <limits.h>
 
diff --git a/engines/wintermute/ad/AdScene.h b/engines/wintermute/ad/ad_scene.h
similarity index 96%
rename from engines/wintermute/ad/AdScene.h
rename to engines/wintermute/ad/ad_scene.h
index f77c64aa9b4..ab62a4a7fc1 100644
--- a/engines/wintermute/ad/AdScene.h
+++ b/engines/wintermute/ad/ad_scene.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADSCENE_H
 #define WINTERMUTE_ADSCENE_H
 
-#include "engines/wintermute/base/BFader.h"
+#include "engines/wintermute/base/base_fader.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdSceneNode.cpp b/engines/wintermute/ad/ad_scene_node.cpp
similarity index 92%
rename from engines/wintermute/ad/AdSceneNode.cpp
rename to engines/wintermute/ad/ad_scene_node.cpp
index 5f518e54426..da7082105ff 100644
--- a/engines/wintermute/ad/AdSceneNode.cpp
+++ b/engines/wintermute/ad/ad_scene_node.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdSceneNode.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/ad/ad_scene_node.h"
+#include "engines/wintermute/base/base_game.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdSceneNode.h b/engines/wintermute/ad/ad_scene_node.h
similarity index 86%
rename from engines/wintermute/ad/AdSceneNode.h
rename to engines/wintermute/ad/ad_scene_node.h
index d081959934c..1c25f91a2db 100644
--- a/engines/wintermute/ad/AdSceneNode.h
+++ b/engines/wintermute/ad/ad_scene_node.h
@@ -30,9 +30,9 @@
 #define WINTERMUTE_ADSCENENODE_H
 
 
-#include "engines/wintermute/ad/AdTypes.h"    // Added by ClassView
-#include "engines/wintermute/ad/AdRegion.h"   // Added by ClassView
-#include "engines/wintermute/ad/AdEntity.h"
+#include "engines/wintermute/ad/ad_types.h"    // Added by ClassView
+#include "engines/wintermute/ad/ad_region.h"   // Added by ClassView
+#include "engines/wintermute/ad/ad_entity.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdSceneState.cpp b/engines/wintermute/ad/ad_scene_state.cpp
similarity index 93%
rename from engines/wintermute/ad/AdSceneState.cpp
rename to engines/wintermute/ad/ad_scene_state.cpp
index 5dfb8c537ec..2ac36054a51 100644
--- a/engines/wintermute/ad/AdSceneState.cpp
+++ b/engines/wintermute/ad/ad_scene_state.cpp
@@ -28,8 +28,8 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/ad/AdSceneState.h"
-#include "engines/wintermute/ad/AdNodeState.h"
+#include "engines/wintermute/ad/ad_scene_state.h"
+#include "engines/wintermute/ad/ad_node_state.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/ad/AdSceneState.h b/engines/wintermute/ad/ad_scene_state.h
similarity index 94%
rename from engines/wintermute/ad/AdSceneState.h
rename to engines/wintermute/ad/ad_scene_state.h
index 82207f383cf..6df20e05781 100644
--- a/engines/wintermute/ad/AdSceneState.h
+++ b/engines/wintermute/ad/ad_scene_state.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADSCENESTATE_H
 
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 #include "engines/wintermute/coll_templ.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/ad/AdSentence.cpp b/engines/wintermute/ad/ad_sentence.cpp
similarity index 90%
rename from engines/wintermute/ad/AdSentence.cpp
rename to engines/wintermute/ad/ad_sentence.cpp
index 98926caac68..2607993aa02 100644
--- a/engines/wintermute/ad/AdSentence.cpp
+++ b/engines/wintermute/ad/ad_sentence.cpp
@@ -27,17 +27,17 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdSentence.h"
-#include "engines/wintermute/ad/AdTalkDef.h"
-#include "engines/wintermute/ad/AdTalkNode.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/ad/AdScene.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_sentence.h"
+#include "engines/wintermute/ad/ad_talk_def.h"
+#include "engines/wintermute/ad/ad_talk_node.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/ad/ad_scene.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdSentence.h b/engines/wintermute/ad/ad_sentence.h
similarity index 92%
rename from engines/wintermute/ad/AdSentence.h
rename to engines/wintermute/ad/ad_sentence.h
index 954568878e9..40f99ea830a 100644
--- a/engines/wintermute/ad/AdSentence.h
+++ b/engines/wintermute/ad/ad_sentence.h
@@ -30,9 +30,9 @@
 #define WINTERMUTE_ADSENTENCE_H
 
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/math/Rect32.h"
+#include "engines/wintermute/math/rect32.h"
 #include "engines/wintermute/dctypes.h"    // Added by ClassView
 #include "common/rect.h"
 
diff --git a/engines/wintermute/ad/AdSpriteSet.cpp b/engines/wintermute/ad/ad_sprite_set.cpp
similarity index 93%
rename from engines/wintermute/ad/AdSpriteSet.cpp
rename to engines/wintermute/ad/ad_sprite_set.cpp
index 127d42d02b3..f0925c69132 100644
--- a/engines/wintermute/ad/AdSpriteSet.cpp
+++ b/engines/wintermute/ad/ad_sprite_set.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdSpriteSet.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_sprite_set.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdSpriteSet.h b/engines/wintermute/ad/ad_sprite_set.h
similarity index 91%
rename from engines/wintermute/ad/AdSpriteSet.h
rename to engines/wintermute/ad/ad_sprite_set.h
index ba5c6fb75be..993832cfa33 100644
--- a/engines/wintermute/ad/AdSpriteSet.h
+++ b/engines/wintermute/ad/ad_sprite_set.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_ADSPRITESET_H
 
 
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/base/BSprite.h"    // Added by ClassView
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/base/base_sprite.h"    // Added by ClassView
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdTalkDef.cpp b/engines/wintermute/ad/ad_talk_def.cpp
similarity index 91%
rename from engines/wintermute/ad/AdTalkDef.cpp
rename to engines/wintermute/ad/ad_talk_def.cpp
index b5982264139..0cd62df603b 100644
--- a/engines/wintermute/ad/AdTalkDef.cpp
+++ b/engines/wintermute/ad/ad_talk_def.cpp
@@ -27,14 +27,14 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdTalkDef.h"
-#include "engines/wintermute/ad/AdTalkNode.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/ad/AdSpriteSet.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_talk_def.h"
+#include "engines/wintermute/ad/ad_talk_node.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/ad/ad_sprite_set.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/utils/utils.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/ad/AdTalkDef.h b/engines/wintermute/ad/ad_talk_def.h
similarity index 94%
rename from engines/wintermute/ad/AdTalkDef.h
rename to engines/wintermute/ad/ad_talk_def.h
index 81d64750134..0811f5b8f5c 100644
--- a/engines/wintermute/ad/AdTalkDef.h
+++ b/engines/wintermute/ad/ad_talk_def.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADTALKDEF_H
 
 #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
 
 namespace WinterMute {
 class CAdTalkNode;
diff --git a/engines/wintermute/ad/AdTalkHolder.cpp b/engines/wintermute/ad/ad_talk_holder.cpp
similarity index 93%
rename from engines/wintermute/ad/AdTalkHolder.cpp
rename to engines/wintermute/ad/ad_talk_holder.cpp
index e1a91792ce7..28e62798c24 100644
--- a/engines/wintermute/ad/AdTalkHolder.cpp
+++ b/engines/wintermute/ad/ad_talk_holder.cpp
@@ -27,13 +27,13 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdTalkHolder.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/ad/ad_talk_holder.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "engines/wintermute/wintermute.h"
 #include "common/str.h"
diff --git a/engines/wintermute/ad/AdTalkHolder.h b/engines/wintermute/ad/ad_talk_holder.h
similarity index 94%
rename from engines/wintermute/ad/AdTalkHolder.h
rename to engines/wintermute/ad/ad_talk_holder.h
index 9e6c3bbd63f..50c2f3504bc 100644
--- a/engines/wintermute/ad/AdTalkHolder.h
+++ b/engines/wintermute/ad/ad_talk_holder.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADTALKHOLDER_H
 #define WINTERMUTE_ADTALKHOLDER_H
 
-#include "engines/wintermute/ad/AdObject.h"
+#include "engines/wintermute/ad/ad_object.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdTalkNode.cpp b/engines/wintermute/ad/ad_talk_node.cpp
similarity index 92%
rename from engines/wintermute/ad/AdTalkNode.cpp
rename to engines/wintermute/ad/ad_talk_node.cpp
index da2195be331..3b82d731c9c 100644
--- a/engines/wintermute/ad/AdTalkNode.cpp
+++ b/engines/wintermute/ad/ad_talk_node.cpp
@@ -27,12 +27,12 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdTalkNode.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/ad/AdSpriteSet.h"
+#include "engines/wintermute/ad/ad_talk_node.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/ad/ad_sprite_set.h"
 #include "engines/wintermute/utils/utils.h"
 namespace WinterMute {
 
diff --git a/engines/wintermute/ad/AdTalkNode.h b/engines/wintermute/ad/ad_talk_node.h
similarity index 94%
rename from engines/wintermute/ad/AdTalkNode.h
rename to engines/wintermute/ad/ad_talk_node.h
index 11bbb353c1f..55adf88e830 100644
--- a/engines/wintermute/ad/AdTalkNode.h
+++ b/engines/wintermute/ad/ad_talk_node.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADTALKNODE_H
 
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 
 namespace WinterMute {
 class CAdSpriteSet;
diff --git a/engines/wintermute/ad/AdTypes.h b/engines/wintermute/ad/ad_types.h
similarity index 100%
rename from engines/wintermute/ad/AdTypes.h
rename to engines/wintermute/ad/ad_types.h
diff --git a/engines/wintermute/ad/AdWaypointGroup.cpp b/engines/wintermute/ad/ad_waypoint_group.cpp
similarity index 91%
rename from engines/wintermute/ad/AdWaypointGroup.cpp
rename to engines/wintermute/ad/ad_waypoint_group.cpp
index 3080b34c090..4a902266aca 100644
--- a/engines/wintermute/ad/AdWaypointGroup.cpp
+++ b/engines/wintermute/ad/ad_waypoint_group.cpp
@@ -26,13 +26,13 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/ad/AdWaypointGroup.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_waypoint_group.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include <limits.h>
 
 namespace WinterMute {
diff --git a/engines/wintermute/ad/AdWaypointGroup.h b/engines/wintermute/ad/ad_waypoint_group.h
similarity index 94%
rename from engines/wintermute/ad/AdWaypointGroup.h
rename to engines/wintermute/ad/ad_waypoint_group.h
index f7c9e4c361f..2cece9e88b5 100644
--- a/engines/wintermute/ad/AdWaypointGroup.h
+++ b/engines/wintermute/ad/ad_waypoint_group.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADWAYPOINTGROUP_H
 #define WINTERMUTE_ADWAYPOINTGROUP_H
 
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
 
 namespace WinterMute {
 class CBPoint;
diff --git a/engines/wintermute/base/BBase.cpp b/engines/wintermute/base/base.cpp
similarity index 92%
rename from engines/wintermute/base/BBase.cpp
rename to engines/wintermute/base/base.cpp
index 76e1150925d..5fabe943121 100644
--- a/engines/wintermute/base/BBase.cpp
+++ b/engines/wintermute/base/base.cpp
@@ -27,10 +27,10 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BBase.h b/engines/wintermute/base/base.h
similarity index 100%
rename from engines/wintermute/base/BBase.h
rename to engines/wintermute/base/base.h
diff --git a/engines/wintermute/base/BActiveRect.cpp b/engines/wintermute/base/base_active_rect.cpp
similarity index 92%
rename from engines/wintermute/base/BActiveRect.cpp
rename to engines/wintermute/base/base_active_rect.cpp
index 836a93ad9af..5895b1acd5f 100644
--- a/engines/wintermute/base/BActiveRect.cpp
+++ b/engines/wintermute/base/base_active_rect.cpp
@@ -27,9 +27,9 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BRegion.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_region.h"
 #include "engines/wintermute/platform_osystem.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/BActiveRect.h b/engines/wintermute/base/base_active_rect.h
similarity index 92%
rename from engines/wintermute/base/BActiveRect.h
rename to engines/wintermute/base/base_active_rect.h
index 935b91eaebc..7c9e8d4a396 100644
--- a/engines/wintermute/base/BActiveRect.h
+++ b/engines/wintermute/base/base_active_rect.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_BACTIVERECT_H
 #define WINTERMUTE_BACTIVERECT_H
 
-#include "engines/wintermute/math/Rect32.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/math/rect32.h"
+#include "engines/wintermute/base/base.h"
 
 namespace WinterMute {
 class CBRegion;
diff --git a/engines/wintermute/base/BDebugger.cpp b/engines/wintermute/base/base_debugger.cpp
similarity index 96%
rename from engines/wintermute/base/BDebugger.cpp
rename to engines/wintermute/base/base_debugger.cpp
index 92f282b6d1c..f56f08dab21 100644
--- a/engines/wintermute/base/BDebugger.cpp
+++ b/engines/wintermute/base/base_debugger.cpp
@@ -26,7 +26,7 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/base/BDebugger.h"
+#include "engines/wintermute/base/base_Debugger.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BDebugger.h b/engines/wintermute/base/base_debugger.h
similarity index 95%
rename from engines/wintermute/base/BDebugger.h
rename to engines/wintermute/base/base_debugger.h
index cea432f7a8c..35ea56eafe0 100644
--- a/engines/wintermute/base/BDebugger.h
+++ b/engines/wintermute/base/base_debugger.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BDEBUGGER_H
 
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 #include "engines/wintermute/wme_debugger.h"
 
 // TODO: The entire debugger should possibly be removed
diff --git a/engines/wintermute/base/BDynBuffer.cpp b/engines/wintermute/base/base_dynamic_buffer.cpp
similarity index 94%
rename from engines/wintermute/base/BDynBuffer.cpp
rename to engines/wintermute/base/base_dynamic_buffer.cpp
index 9a2e0712873..74538382194 100644
--- a/engines/wintermute/base/BDynBuffer.cpp
+++ b/engines/wintermute/base/base_dynamic_buffer.cpp
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BDynBuffer.h b/engines/wintermute/base/base_dynamic_buffer.h
similarity index 94%
rename from engines/wintermute/base/BDynBuffer.h
rename to engines/wintermute/base/base_dynamic_buffer.h
index 66e8182c684..5795fe5bd18 100644
--- a/engines/wintermute/base/BDynBuffer.h
+++ b/engines/wintermute/base/base_dynamic_buffer.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BDYNBUFFER_H
 
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BFader.cpp b/engines/wintermute/base/base_fader.cpp
similarity index 94%
rename from engines/wintermute/base/BFader.cpp
rename to engines/wintermute/base/base_fader.cpp
index 9dec5e1e126..712f64eb6fb 100644
--- a/engines/wintermute/base/BFader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BFader.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_Fader.h"
+#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/util.h"
 
diff --git a/engines/wintermute/base/BFader.h b/engines/wintermute/base/base_fader.h
similarity index 93%
rename from engines/wintermute/base/BFader.h
rename to engines/wintermute/base/base_fader.h
index cc90d4603dc..679f5d0903a 100644
--- a/engines/wintermute/base/BFader.h
+++ b/engines/wintermute/base/base_fader.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BFADER_H
 
 
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BFileManager.cpp b/engines/wintermute/base/base_file_manager.cpp
similarity index 94%
rename from engines/wintermute/base/BFileManager.cpp
rename to engines/wintermute/base/base_file_manager.cpp
index 34638f55e8f..1cb0464a1fb 100644
--- a/engines/wintermute/base/BFileManager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -27,17 +27,17 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/base/file/BDiskFile.h"
-#include "engines/wintermute/base/file/BSaveThumbFile.h"
-#include "engines/wintermute/base/file/BFileEntry.h"
-#include "engines/wintermute/base/file/BPackage.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/base/file/base_disk_file.h"
+#include "engines/wintermute/base/file/base_save_thumb_file.h"
+#include "engines/wintermute/base/file/base_file_entry.h"
+#include "engines/wintermute/base/file/base_package.h"
 #include "engines/wintermute/base/file/BPkgFile.h"
-#include "engines/wintermute/base/BResources.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/file/base_resources.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/dcpackage.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/platform_osystem.h"
diff --git a/engines/wintermute/base/BFileManager.h b/engines/wintermute/base/base_file_manager.h
similarity index 95%
rename from engines/wintermute/base/BFileManager.h
rename to engines/wintermute/base/base_file_manager.h
index 7ea9ff56113..1bf3156ebea 100644
--- a/engines/wintermute/base/BFileManager.h
+++ b/engines/wintermute/base/base_file_manager.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BFILEMANAGER_H
 #define WINTERMUTE_BFILEMANAGER_H
 
-#include "engines/wintermute/base/file/BFileEntry.h"
+#include "engines/wintermute/base/file/base_file_entry.h"
 #include "common/archive.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/base/BFrame.cpp b/engines/wintermute/base/base_frame.cpp
similarity index 94%
rename from engines/wintermute/base/BFrame.cpp
rename to engines/wintermute/base/base_frame.cpp
index d6d8a3aa5cc..468ad298580 100644
--- a/engines/wintermute/base/BFrame.cpp
+++ b/engines/wintermute/base/base_frame.cpp
@@ -27,17 +27,17 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BFrame.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSubFrame.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_frame.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_sub_frame.h"
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
 #include "common/str.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/BFrame.h b/engines/wintermute/base/base_frame.h
similarity index 95%
rename from engines/wintermute/base/BFrame.h
rename to engines/wintermute/base/base_frame.h
index 3d487b4ebce..f3dec4e16f5 100644
--- a/engines/wintermute/base/BFrame.h
+++ b/engines/wintermute/base/base_frame.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BFRAME_H
 #define WINTERMUTE_BFRAME_H
 
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
 #include "engines/wintermute/coll_templ.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/BGame.cpp b/engines/wintermute/base/base_game.cpp
similarity index 95%
rename from engines/wintermute/base/BGame.cpp
rename to engines/wintermute/base/base_game.cpp
index 3e577541b76..d5e9c99dcfd 100644
--- a/engines/wintermute/base/BGame.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -27,40 +27,39 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFader.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_Fader.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
 #include "engines/wintermute/base/gfx/base_image.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
 #include "engines/wintermute/base/gfx/base_renderer.h"
-#include "engines/wintermute/base/BKeyboardState.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BQuickMsg.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BSubFrame.h"
-
-#include "engines/wintermute/base/BTransitionMgr.h"
-#include "engines/wintermute/base/BViewport.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BSaveThumbHelper.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
+#include "engines/wintermute/base/base_keyboard_state.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_quick_msg.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_transition_manager.h"
+#include "engines/wintermute/base/base_viewport.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_save_thumb_helper.h"
+#include "engines/wintermute/base/base_surface_storage.h"
 #include "engines/wintermute/utils/crc.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/ui/UIWindow.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/SXMath.h"
-#include "engines/wintermute/video/VidPlayer.h"
-#include "engines/wintermute/video/VidTheoraPlayer.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/ui/ui_window.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_ext_math.h"
+#include "engines/wintermute/video/video_player.h"
+#include "engines/wintermute/video/video_theora_player.h"
 #include "engines/wintermute/wintermute.h"
 #include "common/savefile.h"
 #include "common/textconsole.h"
diff --git a/engines/wintermute/base/BGame.h b/engines/wintermute/base/base_game.h
similarity index 95%
rename from engines/wintermute/base/BGame.h
rename to engines/wintermute/base/base_game.h
index 7441d81b074..12ab07912bb 100644
--- a/engines/wintermute/base/BGame.h
+++ b/engines/wintermute/base/base_game.h
@@ -29,12 +29,12 @@
 #ifndef WINTERMUTE_BGAME_H
 #define WINTERMUTE_BGAME_H
 
-#include "engines/wintermute/base/BDebugger.h"
+#include "engines/wintermute/base/base_Debugger.h"
 #include "engines/wintermute/base/gfx/base_renderer.h"
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
 #include "engines/wintermute/persistent.h"
 #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/math/Rect32.h"
+#include "engines/wintermute/math/rect32.h"
 #include "common/events.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/BKeyboardState.cpp b/engines/wintermute/base/base_keyboard_state.cpp
similarity index 94%
rename from engines/wintermute/base/BKeyboardState.cpp
rename to engines/wintermute/base/base_keyboard_state.cpp
index 85ab15f58e7..240f642b7f7 100644
--- a/engines/wintermute/base/BKeyboardState.cpp
+++ b/engines/wintermute/base/base_keyboard_state.cpp
@@ -27,9 +27,9 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BKeyboardState.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/base_keyboard_state.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
 #include "common/system.h"
 #include "common/keyboard.h"
 
diff --git a/engines/wintermute/base/BKeyboardState.h b/engines/wintermute/base/base_keyboard_state.h
similarity index 92%
rename from engines/wintermute/base/BKeyboardState.h
rename to engines/wintermute/base/base_keyboard_state.h
index e3a4a903f72..bdf268c6014 100644
--- a/engines/wintermute/base/BKeyboardState.h
+++ b/engines/wintermute/base/base_keyboard_state.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_BKEYBOARD_STATE_H
 
 
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/base/base_scriptable.h"
 #include "common/keyboard.h"
 #include "common/events.h"
 
diff --git a/engines/wintermute/base/BNamedObject.cpp b/engines/wintermute/base/base_named_object.cpp
similarity index 94%
rename from engines/wintermute/base/BNamedObject.cpp
rename to engines/wintermute/base/base_named_object.cpp
index 9587da45e89..da76fb2047b 100644
--- a/engines/wintermute/base/BNamedObject.cpp
+++ b/engines/wintermute/base/base_named_object.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BNamedObject.h"
+#include "engines/wintermute/base/base_named_object.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BNamedObject.h b/engines/wintermute/base/base_named_object.h
similarity index 93%
rename from engines/wintermute/base/BNamedObject.h
rename to engines/wintermute/base/base_named_object.h
index 4d5fdb0c0ee..c03d1417a3a 100644
--- a/engines/wintermute/base/BNamedObject.h
+++ b/engines/wintermute/base/base_named_object.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BNAMEDOBJECT_H
 
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BObject.cpp b/engines/wintermute/base/base_object.cpp
similarity index 95%
rename from engines/wintermute/base/BObject.cpp
rename to engines/wintermute/base/base_object.cpp
index ed5d6fa5b7a..0a4a0638f03 100644
--- a/engines/wintermute/base/BObject.cpp
+++ b/engines/wintermute/base/base_object.cpp
@@ -27,15 +27,15 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/platform_osystem.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/BObject.h b/engines/wintermute/base/base_object.h
similarity index 95%
rename from engines/wintermute/base/BObject.h
rename to engines/wintermute/base/base_object.h
index c855c770b7e..70dc69f53d1 100644
--- a/engines/wintermute/base/BObject.h
+++ b/engines/wintermute/base/base_object.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BOBJECT_H
 
 
-#include "engines/wintermute/base/BScriptHolder.h"
+#include "engines/wintermute/base/base_script_holder.h"
 #include "engines/wintermute/persistent.h"
 #include "common/events.h"
 
diff --git a/engines/wintermute/base/BParser.cpp b/engines/wintermute/base/base_parser.cpp
similarity index 95%
rename from engines/wintermute/base/BParser.cpp
rename to engines/wintermute/base/base_parser.cpp
index 80d3b582139..0f185636aac 100644
--- a/engines/wintermute/base/BParser.cpp
+++ b/engines/wintermute/base/base_parser.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
 #include "common/util.h"
diff --git a/engines/wintermute/base/BParser.h b/engines/wintermute/base/base_parser.h
similarity index 95%
rename from engines/wintermute/base/BParser.h
rename to engines/wintermute/base/base_parser.h
index ae886953a96..53a02c0f681 100644
--- a/engines/wintermute/base/BParser.h
+++ b/engines/wintermute/base/base_parser.h
@@ -52,7 +52,7 @@
 #define PARSERR_EOF             -2
 #define PARSERR_TOKENNOTFOUND   -1
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 #include "engines/wintermute/coll_templ.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/BPersistMgr.cpp b/engines/wintermute/base/base_persistence_manager.cpp
similarity index 94%
rename from engines/wintermute/base/BPersistMgr.cpp
rename to engines/wintermute/base/base_persistence_manager.cpp
index f8faced95f9..743eaf355bc 100644
--- a/engines/wintermute/base/BPersistMgr.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -27,15 +27,15 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BPersistMgr.h"
-#include "engines/wintermute/base/BSaveThumbHelper.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
+#include "engines/wintermute/base/base_save_thumb_helper.h"
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/math/Vector2.h"
-#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/math/vector2.h"
+#include "engines/wintermute/utils/string_util.h"
 #include "engines/wintermute/base/gfx/base_image.h"
-#include "engines/wintermute/base/BSound.h"
+#include "engines/wintermute/base/sound/base_sound.h"
 #include "graphics/decoders/bmp.h"
 #include "common/memstream.h"
 #include "common/str.h"
diff --git a/engines/wintermute/base/BPersistMgr.h b/engines/wintermute/base/base_persistence_manager.h
similarity index 94%
rename from engines/wintermute/base/BPersistMgr.h
rename to engines/wintermute/base/base_persistence_manager.h
index 2e6ee8058c2..f2fd42ceca8 100644
--- a/engines/wintermute/base/BPersistMgr.h
+++ b/engines/wintermute/base/base_persistence_manager.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_BPERSISTMGR_H
 
 
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/math/Rect32.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/math/rect32.h"
 #include "engines/savestate.h"
 #include "common/stream.h"
 #include "common/str.h"
diff --git a/engines/wintermute/base/BPoint.cpp b/engines/wintermute/base/base_point.cpp
similarity index 91%
rename from engines/wintermute/base/BPoint.cpp
rename to engines/wintermute/base/base_point.cpp
index 4c80e154f29..6887349a7ae 100644
--- a/engines/wintermute/base/BPoint.cpp
+++ b/engines/wintermute/base/base_point.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BPoint.h"
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/base/base_Point.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BPoint.h b/engines/wintermute/base/base_point.h
similarity index 93%
rename from engines/wintermute/base/BPoint.h
rename to engines/wintermute/base/base_point.h
index 3e4adb5d13b..363ab1f919a 100644
--- a/engines/wintermute/base/BPoint.h
+++ b/engines/wintermute/base/base_point.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BPOINT_H
 
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BQuickMsg.cpp b/engines/wintermute/base/base_quick_msg.cpp
similarity index 91%
rename from engines/wintermute/base/BQuickMsg.cpp
rename to engines/wintermute/base/base_quick_msg.cpp
index 32bd04afe23..ac1001a2fea 100644
--- a/engines/wintermute/base/BQuickMsg.cpp
+++ b/engines/wintermute/base/base_quick_msg.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BQuickMsg.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_quick_msg.h"
+#include "engines/wintermute/base/base_game.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BQuickMsg.h b/engines/wintermute/base/base_quick_msg.h
similarity index 93%
rename from engines/wintermute/base/BQuickMsg.h
rename to engines/wintermute/base/base_quick_msg.h
index c2471837144..9a689299329 100644
--- a/engines/wintermute/base/BQuickMsg.h
+++ b/engines/wintermute/base/base_quick_msg.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BQUICKMSG_H
 #define WINTERMUTE_BQUICKMSG_H
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BRegion.cpp b/engines/wintermute/base/base_region.cpp
similarity index 93%
rename from engines/wintermute/base/BRegion.cpp
rename to engines/wintermute/base/base_region.cpp
index c8ec87e04ad..3e513f9fb8e 100644
--- a/engines/wintermute/base/BRegion.cpp
+++ b/engines/wintermute/base/base_region.cpp
@@ -27,14 +27,14 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/platform_osystem.h"
 #include <limits.h>
 
diff --git a/engines/wintermute/base/BRegion.h b/engines/wintermute/base/base_region.h
similarity index 92%
rename from engines/wintermute/base/BRegion.h
rename to engines/wintermute/base/base_region.h
index 2a92d9daffa..5de1fb9eefa 100644
--- a/engines/wintermute/base/BRegion.h
+++ b/engines/wintermute/base/base_region.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_BREGION_H
 #define WINTERMUTE_BREGION_H
 
-#include "engines/wintermute/base/BPoint.h"
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_Point.h"
+#include "engines/wintermute/base/base_object.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BRegistry.cpp b/engines/wintermute/base/base_registry.cpp
similarity index 94%
rename from engines/wintermute/base/BRegistry.cpp
rename to engines/wintermute/base/base_registry.cpp
index fef09d7479c..350a34b61e1 100644
--- a/engines/wintermute/base/BRegistry.cpp
+++ b/engines/wintermute/base/base_registry.cpp
@@ -27,10 +27,10 @@
  */
 
 #include "engines/wintermute/tinyxml/tinyxml.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/utils/string_util.h"
 #include "engines/wintermute/utils/utils.h"
 #include "common/config-manager.h"
 #include "common/file.h"
diff --git a/engines/wintermute/base/BRegistry.h b/engines/wintermute/base/base_registry.h
similarity index 95%
rename from engines/wintermute/base/BRegistry.h
rename to engines/wintermute/base/base_registry.h
index 123d1d8a2f1..06e052cd036 100644
--- a/engines/wintermute/base/BRegistry.h
+++ b/engines/wintermute/base/base_registry.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BREGISTRY_H
 #define WINTERMUTE_BREGISTRY_H
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BSaveThumbHelper.cpp b/engines/wintermute/base/base_save_thumb_helper.cpp
similarity index 92%
rename from engines/wintermute/base/BSaveThumbHelper.cpp
rename to engines/wintermute/base/base_save_thumb_helper.cpp
index 415d4ed1e4c..bee63aa307c 100644
--- a/engines/wintermute/base/BSaveThumbHelper.cpp
+++ b/engines/wintermute/base/base_save_thumb_helper.cpp
@@ -27,9 +27,9 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BSaveThumbHelper.h"
+#include "engines/wintermute/base/base_save_thumb_helper.h"
 #include "engines/wintermute/base/gfx/base_image.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_game.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BSaveThumbHelper.h b/engines/wintermute/base/base_save_thumb_helper.h
similarity index 93%
rename from engines/wintermute/base/BSaveThumbHelper.h
rename to engines/wintermute/base/base_save_thumb_helper.h
index 30db32cfb2b..e8cdbdc00d9 100644
--- a/engines/wintermute/base/BSaveThumbHelper.h
+++ b/engines/wintermute/base/base_save_thumb_helper.h
@@ -29,7 +29,7 @@
 #define WINTERMUTE_BSAVETHUMBHELPER_H
 
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BScriptHolder.cpp b/engines/wintermute/base/base_script_holder.cpp
similarity index 93%
rename from engines/wintermute/base/BScriptHolder.cpp
rename to engines/wintermute/base/base_script_holder.cpp
index 65d37b2e5c6..5192f76f6e8 100644
--- a/engines/wintermute/base/BScriptHolder.cpp
+++ b/engines/wintermute/base/base_script_holder.cpp
@@ -27,13 +27,13 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/base/BScriptHolder.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/base/base_script_holder.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BScriptHolder.h b/engines/wintermute/base/base_script_holder.h
similarity index 95%
rename from engines/wintermute/base/BScriptHolder.h
rename to engines/wintermute/base/base_script_holder.h
index 1e82b8cacff..0e5bc1b7ec6 100644
--- a/engines/wintermute/base/BScriptHolder.h
+++ b/engines/wintermute/base/base_script_holder.h
@@ -31,7 +31,7 @@
 
 #include "engines/wintermute/coll_templ.h"
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BScriptable.cpp b/engines/wintermute/base/base_scriptable.cpp
similarity index 93%
rename from engines/wintermute/base/BScriptable.cpp
rename to engines/wintermute/base/base_scriptable.cpp
index d1e3556a85a..e9489fa407e 100644
--- a/engines/wintermute/base/BScriptable.cpp
+++ b/engines/wintermute/base/base_scriptable.cpp
@@ -27,9 +27,9 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BScriptable.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/base/base_scriptable.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BScriptable.h b/engines/wintermute/base/base_scriptable.h
similarity index 95%
rename from engines/wintermute/base/BScriptable.h
rename to engines/wintermute/base/base_scriptable.h
index 534bd3bdf10..166f3c0bd16 100644
--- a/engines/wintermute/base/BScriptable.h
+++ b/engines/wintermute/base/base_scriptable.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BSCRIPTABLE_H
 
 
-#include "engines/wintermute/base/BNamedObject.h"
+#include "engines/wintermute/base/base_named_object.h"
 #include "engines/wintermute/wme_debugger.h"
 #include "engines/wintermute/persistent.h"
 
diff --git a/engines/wintermute/base/BSprite.cpp b/engines/wintermute/base/base_sprite.cpp
similarity index 93%
rename from engines/wintermute/base/BSprite.cpp
rename to engines/wintermute/base/base_sprite.cpp
index c4dfaa3f8d2..ba55d1b88b5 100644
--- a/engines/wintermute/base/BSprite.cpp
+++ b/engines/wintermute/base/base_sprite.cpp
@@ -27,21 +27,21 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFrame.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_frame.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BSprite.h b/engines/wintermute/base/base_sprite.h
similarity index 95%
rename from engines/wintermute/base/BSprite.h
rename to engines/wintermute/base/base_sprite.h
index 3c67e5f3fee..8f3ce84eb46 100644
--- a/engines/wintermute/base/BSprite.h
+++ b/engines/wintermute/base/base_sprite.h
@@ -31,7 +31,7 @@
 
 
 #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BScriptHolder.h"
+#include "engines/wintermute/base/base_script_holder.h"
 
 namespace WinterMute {
 class CBFrame;
diff --git a/engines/wintermute/base/BStringTable.cpp b/engines/wintermute/base/base_string_table.cpp
similarity index 93%
rename from engines/wintermute/base/BStringTable.cpp
rename to engines/wintermute/base/base_string_table.cpp
index 470ae8549cd..c7789add9dc 100644
--- a/engines/wintermute/base/BStringTable.cpp
+++ b/engines/wintermute/base/base_string_table.cpp
@@ -27,10 +27,10 @@
  */
 
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/utils/string_util.h"
 #include "common/str.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/BStringTable.h b/engines/wintermute/base/base_string_table.h
similarity index 94%
rename from engines/wintermute/base/BStringTable.h
rename to engines/wintermute/base/base_string_table.h
index 92d3604b4d3..c612c33a414 100644
--- a/engines/wintermute/base/BStringTable.h
+++ b/engines/wintermute/base/base_string_table.h
@@ -31,7 +31,7 @@
 
 
 #include "common/hashmap.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BSubFrame.cpp b/engines/wintermute/base/base_sub_frame.cpp
similarity index 94%
rename from engines/wintermute/base/BSubFrame.cpp
rename to engines/wintermute/base/base_sub_frame.cpp
index 858f2125c6d..adce6c6b75b 100644
--- a/engines/wintermute/base/BSubFrame.cpp
+++ b/engines/wintermute/base/base_sub_frame.cpp
@@ -27,16 +27,16 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_surface_storage.h"
+#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BSubFrame.h b/engines/wintermute/base/base_sub_frame.h
similarity index 93%
rename from engines/wintermute/base/BSubFrame.h
rename to engines/wintermute/base/base_sub_frame.h
index 57ffcae675e..6fb24c0e4fc 100644
--- a/engines/wintermute/base/BSubFrame.h
+++ b/engines/wintermute/base/base_sub_frame.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_BSUBFRAME_H
 
 
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/base/base_scriptable.h"
 
 namespace WinterMute {
 class CBObject;
diff --git a/engines/wintermute/base/BSurfaceStorage.cpp b/engines/wintermute/base/base_surface_storage.cpp
similarity index 94%
rename from engines/wintermute/base/BSurfaceStorage.cpp
rename to engines/wintermute/base/base_surface_storage.cpp
index 406535cf392..06c2f1b0cc9 100644
--- a/engines/wintermute/base/BSurfaceStorage.cpp
+++ b/engines/wintermute/base/base_surface_storage.cpp
@@ -27,10 +27,10 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
+#include "engines/wintermute/base/base_surface_storage.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/base/BSurfaceStorage.h b/engines/wintermute/base/base_surface_storage.h
similarity index 94%
rename from engines/wintermute/base/BSurfaceStorage.h
rename to engines/wintermute/base/base_surface_storage.h
index c054c2a55b5..58f25e68757 100644
--- a/engines/wintermute/base/BSurfaceStorage.h
+++ b/engines/wintermute/base/base_surface_storage.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BSURFACESTORAGE_H
 #define WINTERMUTE_BSURFACESTORAGE_H
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 #include "common/array.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/BTransitionMgr.cpp b/engines/wintermute/base/base_transition_manager.cpp
similarity index 93%
rename from engines/wintermute/base/BTransitionMgr.cpp
rename to engines/wintermute/base/base_transition_manager.cpp
index 1cea7285bfc..30a1a32e6a1 100644
--- a/engines/wintermute/base/BTransitionMgr.cpp
+++ b/engines/wintermute/base/base_transition_manager.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BTransitionMgr.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_transition_manager.h"
+#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/platform_osystem.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/BTransitionMgr.h b/engines/wintermute/base/base_transition_manager.h
similarity index 94%
rename from engines/wintermute/base/BTransitionMgr.h
rename to engines/wintermute/base/base_transition_manager.h
index faedb6fe3ef..9b84c653e98 100644
--- a/engines/wintermute/base/BTransitionMgr.h
+++ b/engines/wintermute/base/base_transition_manager.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BTRANSITIONMGR_H
 #define WINTERMUTE_BTRANSITIONMGR_H
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BViewport.cpp b/engines/wintermute/base/base_viewport.cpp
similarity index 93%
rename from engines/wintermute/base/BViewport.cpp
rename to engines/wintermute/base/base_viewport.cpp
index 2b237a0d388..83cbc5b0f0a 100644
--- a/engines/wintermute/base/BViewport.cpp
+++ b/engines/wintermute/base/base_viewport.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/BViewport.h"
+#include "engines/wintermute/base/base_viewport.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BViewport.h b/engines/wintermute/base/base_viewport.h
similarity index 94%
rename from engines/wintermute/base/BViewport.h
rename to engines/wintermute/base/base_viewport.h
index 1150b8ebe77..795e6f404fa 100644
--- a/engines/wintermute/base/BViewport.h
+++ b/engines/wintermute/base/base_viewport.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BVIEWPORT_H
 
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 
 namespace WinterMute {
 class CBObject;
diff --git a/engines/wintermute/base/file/BPkgFile.cpp b/engines/wintermute/base/file/BPkgFile.cpp
index b7878512906..3acde9c1ffe 100644
--- a/engines/wintermute/base/file/BPkgFile.cpp
+++ b/engines/wintermute/base/file/BPkgFile.cpp
@@ -27,10 +27,10 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BPackage.h"
+#include "engines/wintermute/base/file/base_package.h"
 #include "engines/wintermute/base/file/BPkgFile.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "common/util.h"
 #include "common/file.h"
 #include "common/stream.h"
diff --git a/engines/wintermute/base/file/BPkgFile.h b/engines/wintermute/base/file/BPkgFile.h
index dc8b4b684f5..4356ae55199 100644
--- a/engines/wintermute/base/file/BPkgFile.h
+++ b/engines/wintermute/base/file/BPkgFile.h
@@ -29,7 +29,10 @@
 #ifndef WINTERMUTE_BPKGFILE_H
 #define WINTERMUTE_BPKGFILE_H
 
-#include "engines/wintermute/base/file/BFileEntry.h"
+#include "engines/wintermute/base/file/base_file_entry.h"
+
+// This file is only needed until the next merge/rebase, as wrapCompressedStream now can set a known size
+// as such it is not renamed to follow the convention of the rest of the files.
 
 namespace Common {
 class SeekableReadStream;
diff --git a/engines/wintermute/base/file/BDiskFile.cpp b/engines/wintermute/base/file/base_disk_file.cpp
similarity index 92%
rename from engines/wintermute/base/file/BDiskFile.cpp
rename to engines/wintermute/base/file/base_disk_file.cpp
index 739eafcc73f..99bf9cff3fb 100644
--- a/engines/wintermute/base/file/BDiskFile.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/wintypes.h"
 #include "engines/wintermute/base/file/BPkgFile.h"
-#include "engines/wintermute/base/file/BDiskFile.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/file/base_disk_file.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "common/stream.h"
 #include "common/memstream.h"
 #include "common/file.h"
diff --git a/engines/wintermute/base/file/BDiskFile.h b/engines/wintermute/base/file/base_disk_file.h
similarity index 100%
rename from engines/wintermute/base/file/BDiskFile.h
rename to engines/wintermute/base/file/base_disk_file.h
diff --git a/engines/wintermute/base/file/BFile.cpp b/engines/wintermute/base/file/base_file.cpp
similarity index 94%
rename from engines/wintermute/base/file/BFile.cpp
rename to engines/wintermute/base/file/base_file.cpp
index 911039e36dc..88a64cb1478 100644
--- a/engines/wintermute/base/file/BFile.cpp
+++ b/engines/wintermute/base/file/base_file.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BFile.h"
+#include "engines/wintermute/base/file/base_file.h"
 #include "common/memstream.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/file/BFile.h b/engines/wintermute/base/file/base_file.h
similarity index 94%
rename from engines/wintermute/base/file/BFile.h
rename to engines/wintermute/base/file/base_file.h
index d1737df0cef..b29fc412995 100644
--- a/engines/wintermute/base/file/BFile.h
+++ b/engines/wintermute/base/file/base_file.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BFILE_H
 
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 #include "common/str.h"
 #include "common/stream.h"
 
diff --git a/engines/wintermute/base/file/BFileEntry.cpp b/engines/wintermute/base/file/base_file_entry.cpp
similarity index 93%
rename from engines/wintermute/base/file/BFileEntry.cpp
rename to engines/wintermute/base/file/base_file_entry.cpp
index b00ecb6f9d5..3b6f4c7c168 100644
--- a/engines/wintermute/base/file/BFileEntry.cpp
+++ b/engines/wintermute/base/file/base_file_entry.cpp
@@ -26,7 +26,7 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BFileEntry.h"
+#include "engines/wintermute/base/file/base_file_entry.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/file/BFileEntry.h b/engines/wintermute/base/file/base_file_entry.h
similarity index 93%
rename from engines/wintermute/base/file/BFileEntry.h
rename to engines/wintermute/base/file/base_file_entry.h
index 5fdf2b63080..ed808210049 100644
--- a/engines/wintermute/base/file/BFileEntry.h
+++ b/engines/wintermute/base/file/base_file_entry.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BFILEENTRY_H
 
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/file/BPackage.cpp b/engines/wintermute/base/file/base_package.cpp
similarity index 92%
rename from engines/wintermute/base/file/BPackage.cpp
rename to engines/wintermute/base/file/base_package.cpp
index bddf1abc1e0..fab6409c002 100644
--- a/engines/wintermute/base/file/BPackage.cpp
+++ b/engines/wintermute/base/file/base_package.cpp
@@ -27,9 +27,9 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BPackage.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/file/base_package.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "common/file.h"
 #include "common/stream.h"
 
diff --git a/engines/wintermute/base/file/BPackage.h b/engines/wintermute/base/file/base_package.h
similarity index 94%
rename from engines/wintermute/base/file/BPackage.h
rename to engines/wintermute/base/file/base_package.h
index 8c803fddd9d..52fc4f96772 100644
--- a/engines/wintermute/base/file/BPackage.h
+++ b/engines/wintermute/base/file/base_package.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BPACKAGE_H
 
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 
 namespace Common {
 class SeekableReadStream;
diff --git a/engines/wintermute/base/BResources.cpp b/engines/wintermute/base/file/base_resources.cpp
similarity index 98%
rename from engines/wintermute/base/BResources.cpp
rename to engines/wintermute/base/file/base_resources.cpp
index 839be570c56..09cbae88fe0 100644
--- a/engines/wintermute/base/BResources.cpp
+++ b/engines/wintermute/base/file/base_resources.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/BResources.h"
+#include "engines/wintermute/base/file/base_resources.h"
 #include "common/str.h"
 #include "common/memstream.h"
 
diff --git a/engines/wintermute/base/BResources.h b/engines/wintermute/base/file/base_resources.h
similarity index 100%
rename from engines/wintermute/base/BResources.h
rename to engines/wintermute/base/file/base_resources.h
diff --git a/engines/wintermute/base/file/BSaveThumbFile.cpp b/engines/wintermute/base/file/base_save_thumb_file.cpp
similarity index 93%
rename from engines/wintermute/base/file/BSaveThumbFile.cpp
rename to engines/wintermute/base/file/base_save_thumb_file.cpp
index 4a75b7d7ce5..68200d3fc6e 100644
--- a/engines/wintermute/base/file/BSaveThumbFile.cpp
+++ b/engines/wintermute/base/file/base_save_thumb_file.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/file/BSaveThumbFile.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/file/base_save_thumb_file.h"
 #include "engines/wintermute/platform_osystem.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/file/BSaveThumbFile.h b/engines/wintermute/base/file/base_save_thumb_file.h
similarity index 93%
rename from engines/wintermute/base/file/BSaveThumbFile.h
rename to engines/wintermute/base/file/base_save_thumb_file.h
index 5d33ac22207..42566581e2d 100644
--- a/engines/wintermute/base/file/BSaveThumbFile.h
+++ b/engines/wintermute/base/file/base_save_thumb_file.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BSAVETHUMBFILE_H
 
 
-#include "engines/wintermute/base/file/BFile.h"
+#include "engines/wintermute/base/file/base_file.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/font/BFont.cpp b/engines/wintermute/base/font/base_font.cpp
similarity index 90%
rename from engines/wintermute/base/font/BFont.cpp
rename to engines/wintermute/base/font/base_font.cpp
index 5d0086c5817..8976cfdabd5 100644
--- a/engines/wintermute/base/font/BFont.cpp
+++ b/engines/wintermute/base/font/base_font.cpp
@@ -27,12 +27,12 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/font/BFontBitmap.h"
-#include "engines/wintermute/base/font/BFontTT.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/font/base_font_bitmap.h"
+#include "engines/wintermute/base/font/base_font_truetype.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_game.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/font/BFont.h b/engines/wintermute/base/font/base_font.h
similarity index 94%
rename from engines/wintermute/base/font/BFont.h
rename to engines/wintermute/base/font/base_font.h
index a6ab757b0dc..3df3090bb92 100644
--- a/engines/wintermute/base/font/BFont.h
+++ b/engines/wintermute/base/font/base_font.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BFONT_H
 #define WINTERMUTE_BFONT_H
 
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
 
 #define NUM_CHARACTERS 256
 
diff --git a/engines/wintermute/base/font/BFontBitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp
similarity index 93%
rename from engines/wintermute/base/font/BFontBitmap.cpp
rename to engines/wintermute/base/font/base_font_bitmap.cpp
index 62576cdfea5..ef730afb0a1 100644
--- a/engines/wintermute/base/font/BFontBitmap.cpp
+++ b/engines/wintermute/base/font/base_font_bitmap.cpp
@@ -27,16 +27,16 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/font/BFontBitmap.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BFrame.h"
+#include "engines/wintermute/base/font/base_font_bitmap.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_frame.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/BFrame.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_frame.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/platform_osystem.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/font/BFontBitmap.h b/engines/wintermute/base/font/base_font_bitmap.h
similarity index 94%
rename from engines/wintermute/base/font/BFontBitmap.h
rename to engines/wintermute/base/font/base_font_bitmap.h
index 17bf433f650..8af530cbc96 100644
--- a/engines/wintermute/base/font/BFontBitmap.h
+++ b/engines/wintermute/base/font/base_font_bitmap.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BFONTBITMAP_H
 
 
-#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/base/font/base_font.h"
 
 namespace WinterMute {
 class CBSubFrame;
diff --git a/engines/wintermute/base/font/BFontStorage.cpp b/engines/wintermute/base/font/base_font_storage.cpp
similarity index 92%
rename from engines/wintermute/base/font/BFontStorage.cpp
rename to engines/wintermute/base/font/base_font_storage.cpp
index b5605cf2bca..13f779f2cbf 100644
--- a/engines/wintermute/base/font/BFontStorage.cpp
+++ b/engines/wintermute/base/font/base_font_storage.cpp
@@ -27,9 +27,9 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/base/font/BFontStorage.h b/engines/wintermute/base/font/base_font_storage.h
similarity index 94%
rename from engines/wintermute/base/font/BFontStorage.h
rename to engines/wintermute/base/font/base_font_storage.h
index 9759d5d25e2..7c88e9a2f4d 100644
--- a/engines/wintermute/base/font/BFontStorage.h
+++ b/engines/wintermute/base/font/base_font_storage.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BFONTSTORAGE_H
 
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 #include "engines/wintermute/persistent.h"
 #include "engines/wintermute/coll_templ.h"
 
diff --git a/engines/wintermute/base/font/BFontTT.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
similarity index 94%
rename from engines/wintermute/base/font/BFontTT.cpp
rename to engines/wintermute/base/font/base_font_truetype.cpp
index 5f0c9fec1a7..a52922fb760 100644
--- a/engines/wintermute/base/font/BFontTT.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -27,16 +27,16 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BFile.h"
-#include "engines/wintermute/base/font/BFontTT.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/math/MathUtil.h"
+#include "engines/wintermute/base/file/base_file.h"
+#include "engines/wintermute/base/font/base_font_truetype.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/math/math_util.h"
 #include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "engines/wintermute/wintermute.h"
diff --git a/engines/wintermute/base/font/BFontTT.h b/engines/wintermute/base/font/base_font_truetype.h
similarity index 93%
rename from engines/wintermute/base/font/BFontTT.h
rename to engines/wintermute/base/font/base_font_truetype.h
index 9b995b293e9..4d8e71a3ff7 100644
--- a/engines/wintermute/base/font/BFontTT.h
+++ b/engines/wintermute/base/font/base_font_truetype.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_BFONTTT_H
 #define WINTERMUTE_BFONTTT_H
 
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
 #include "common/rect.h"
 #include "graphics/surface.h"
diff --git a/engines/wintermute/base/gfx/base_image.cpp b/engines/wintermute/base/gfx/base_image.cpp
index f1e27c96220..fb6b23db2bc 100644
--- a/engines/wintermute/base/gfx/base_image.cpp
+++ b/engines/wintermute/base/gfx/base_image.cpp
@@ -28,10 +28,10 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/base/gfx/base_image.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/graphics/transparentSurface.h"
-#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/graphics/transparent_surface.h"
+#include "engines/wintermute/utils/string_util.h"
 #include "graphics/decoders/png.h"
 #include "graphics/decoders/jpeg.h"
 #include "graphics/decoders/bmp.h"
diff --git a/engines/wintermute/base/gfx/base_image.h b/engines/wintermute/base/gfx/base_image.h
index 646a9ddd2d7..6cda3e6b464 100644
--- a/engines/wintermute/base/gfx/base_image.h
+++ b/engines/wintermute/base/gfx/base_image.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BIMAGE_H
 #define WINTERMUTE_BIMAGE_H
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 #include "graphics/surface.h"
 #include "graphics/pixelformat.h"
 #include "graphics/decoders/image_decoder.h"
diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp
index 5c5ebd91b44..a8c19362f64 100644
--- a/engines/wintermute/base/gfx/base_renderer.cpp
+++ b/engines/wintermute/base/gfx/base_renderer.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BActiveRect.h"
+#include "engines/wintermute/base/base_active_rect.h"
 #include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/BRegion.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_region.h"
 #include "engines/wintermute/platform_osystem.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h
index 81c13f8b394..d743f19791f 100644
--- a/engines/wintermute/base/gfx/base_renderer.h
+++ b/engines/wintermute/base/gfx/base_renderer.h
@@ -31,7 +31,7 @@
 
 
 #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 #include "common/rect.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/gfx/base_surface.cpp b/engines/wintermute/base/gfx/base_surface.cpp
index 6c0ca40765d..73b385d1808 100644
--- a/engines/wintermute/base/gfx/base_surface.cpp
+++ b/engines/wintermute/base/gfx/base_surface.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/wintypes.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/gfx/base_surface.h b/engines/wintermute/base/gfx/base_surface.h
index f5fbd495aa6..22c1fb83b8e 100644
--- a/engines/wintermute/base/gfx/base_surface.h
+++ b/engines/wintermute/base/gfx/base_surface.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_BSURFACE_H
 #define WINTERMUTE_BSURFACE_H
 
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/math/Rect32.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/math/rect32.h"
 #include "graphics/surface.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index ee971ab6c9f..dbd25119287 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -28,15 +28,15 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/base/gfx/osystem/base_render_osystem.h"
-#include "engines/wintermute/base/BRegistry.h"
+#include "engines/wintermute/base/base_registry.h"
 #include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
+#include "engines/wintermute/base/base_surface_storage.h"
 #include "engines/wintermute/base/gfx/base_image.h"
-#include "engines/wintermute/math/MathUtil.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/math/math_util.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sprite.h"
 #include "common/system.h"
-#include "engines/wintermute/graphics/transparentSurface.h"
+#include "engines/wintermute/graphics/transparent_surface.h"
 #include "common/queue.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
index 66c6e4a61ab..87c5731b49e 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/base/file/BFile.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/file/base_file.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h"
 #include "engines/wintermute/base/gfx/osystem/base_render_osystem.h"
 #include "engines/wintermute/base/gfx/base_image.h"
@@ -36,7 +36,7 @@
 #include "graphics/decoders/png.h"
 #include "graphics/decoders/bmp.h"
 #include "graphics/decoders/jpeg.h"
-#include "engines/wintermute/graphics/transparentSurface.h"
+#include "engines/wintermute/graphics/transparent_surface.h"
 #include "engines/wintermute/graphics/tga.h"
 #include "graphics/pixelformat.h"
 #include "graphics/surface.h"
diff --git a/engines/wintermute/base/particles/PartEmitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
similarity index 95%
rename from engines/wintermute/base/particles/PartEmitter.cpp
rename to engines/wintermute/base/particles/part_emitter.cpp
index 97de1fe044b..11ebafd329f 100644
--- a/engines/wintermute/base/particles/PartEmitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -27,15 +27,15 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/particles/PartEmitter.h"
-#include "engines/wintermute/base/particles/PartParticle.h"
-#include "engines/wintermute/math/Vector2.h"
+#include "engines/wintermute/base/particles/part_emitter.h"
+#include "engines/wintermute/base/particles/part_particle.h"
+#include "engines/wintermute/math/vector2.h"
 #include "engines/wintermute/math/Matrix4.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
diff --git a/engines/wintermute/base/particles/PartEmitter.h b/engines/wintermute/base/particles/part_emitter.h
similarity index 93%
rename from engines/wintermute/base/particles/PartEmitter.h
rename to engines/wintermute/base/particles/part_emitter.h
index 51567836539..cff0a1ec83b 100644
--- a/engines/wintermute/base/particles/PartEmitter.h
+++ b/engines/wintermute/base/particles/part_emitter.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_PARTEMITTER_H
 
 
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/base/particles/PartForce.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/base/particles/part_force.h"
 
 namespace WinterMute {
 class CBRegion;
diff --git a/engines/wintermute/base/particles/PartForce.cpp b/engines/wintermute/base/particles/part_force.cpp
similarity index 91%
rename from engines/wintermute/base/particles/PartForce.cpp
rename to engines/wintermute/base/particles/part_force.cpp
index b864c05292f..2f330c21b0e 100644
--- a/engines/wintermute/base/particles/PartForce.cpp
+++ b/engines/wintermute/base/particles/part_force.cpp
@@ -28,8 +28,8 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/particles/PartForce.h"
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/base/particles/part_force.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/particles/PartForce.h b/engines/wintermute/base/particles/part_force.h
similarity index 88%
rename from engines/wintermute/base/particles/PartForce.h
rename to engines/wintermute/base/particles/part_force.h
index 640c8d7f204..f0a6d66c435 100644
--- a/engines/wintermute/base/particles/PartForce.h
+++ b/engines/wintermute/base/particles/part_force.h
@@ -30,9 +30,9 @@
 #define WINTERMUTE_PARTFORCE_H
 
 
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/base/BNamedObject.h"
-#include "engines/wintermute/math/Vector2.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/base/base_named_object.h"
+#include "engines/wintermute/math/vector2.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/particles/PartParticle.cpp b/engines/wintermute/base/particles/part_particle.cpp
similarity index 93%
rename from engines/wintermute/base/particles/PartParticle.cpp
rename to engines/wintermute/base/particles/part_particle.cpp
index 14392319931..931f7558c71 100644
--- a/engines/wintermute/base/particles/PartParticle.cpp
+++ b/engines/wintermute/base/particles/part_particle.cpp
@@ -27,10 +27,10 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/particles/PartParticle.h"
-#include "engines/wintermute/base/particles/PartEmitter.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/particles/part_particle.h"
+#include "engines/wintermute/base/particles/part_emitter.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
diff --git a/engines/wintermute/base/particles/PartParticle.h b/engines/wintermute/base/particles/part_particle.h
similarity index 90%
rename from engines/wintermute/base/particles/PartParticle.h
rename to engines/wintermute/base/particles/part_particle.h
index ab5730d3c56..0b256d44ec4 100644
--- a/engines/wintermute/base/particles/PartParticle.h
+++ b/engines/wintermute/base/particles/part_particle.h
@@ -30,9 +30,9 @@
 #define WINTERMUTE_PARTPARTICLE_H
 
 
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/math/Rect32.h"
-#include "engines/wintermute/math/Vector2.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/math/rect32.h"
+#include "engines/wintermute/math/vector2.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/scriptables/ScScript.cpp b/engines/wintermute/base/scriptables/script.cpp
similarity index 95%
rename from engines/wintermute/base/scriptables/ScScript.cpp
rename to engines/wintermute/base/scriptables/script.cpp
index 0b5b3c24bf7..a9646e00451 100644
--- a/engines/wintermute/base/scriptables/ScScript.cpp
+++ b/engines/wintermute/base/scriptables/script.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
 #include "common/memstream.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScScript.h b/engines/wintermute/base/scriptables/script.h
similarity index 95%
rename from engines/wintermute/base/scriptables/ScScript.h
rename to engines/wintermute/base/scriptables/script.h
index c031f8186fe..899e1f3098f 100644
--- a/engines/wintermute/base/scriptables/ScScript.h
+++ b/engines/wintermute/base/scriptables/script.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SCSCRIPT_H
 
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 #include "engines/wintermute/dcscript.h"   // Added by ClassView
 #include "engines/wintermute/coll_templ.h"
 
diff --git a/engines/wintermute/base/scriptables/ScEngine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp
similarity index 93%
rename from engines/wintermute/base/scriptables/ScEngine.cpp
rename to engines/wintermute/base/scriptables/script_engine.cpp
index db79a7d0e9e..387093ac4a2 100644
--- a/engines/wintermute/base/scriptables/ScEngine.cpp
+++ b/engines/wintermute/base/scriptables/script_engine.cpp
@@ -27,16 +27,16 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/SXMath.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_ext_math.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_file_manager.h"
 
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScEngine.h b/engines/wintermute/base/scriptables/script_engine.h
similarity index 95%
rename from engines/wintermute/base/scriptables/ScEngine.h
rename to engines/wintermute/base/scriptables/script_engine.h
index 0322319b3db..81dc13a73ce 100644
--- a/engines/wintermute/base/scriptables/ScEngine.h
+++ b/engines/wintermute/base/scriptables/script_engine.h
@@ -31,7 +31,7 @@
 
 #include "engines/wintermute/persistent.h"
 #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 #include "engines/wintermute/wme_debugger.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/platform_osystem.h"
diff --git a/engines/wintermute/base/scriptables/SXArray.cpp b/engines/wintermute/base/scriptables/script_ext_array.cpp
similarity index 93%
rename from engines/wintermute/base/scriptables/SXArray.cpp
rename to engines/wintermute/base/scriptables/script_ext_array.cpp
index 425118a3e7d..a1b8249cb1f 100644
--- a/engines/wintermute/base/scriptables/SXArray.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_array.cpp
@@ -27,10 +27,10 @@
  */
 
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/system/SysInstance.h"
-#include "engines/wintermute/base/scriptables/SXArray.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/system/sys_instance.h"
+#include "engines/wintermute/base/scriptables/script_ext_array.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/scriptables/SXArray.h b/engines/wintermute/base/scriptables/script_ext_array.h
similarity index 94%
rename from engines/wintermute/base/scriptables/SXArray.h
rename to engines/wintermute/base/scriptables/script_ext_array.h
index 0f46bd546e9..b8734165723 100644
--- a/engines/wintermute/base/scriptables/SXArray.h
+++ b/engines/wintermute/base/scriptables/script_ext_array.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_SXARRAY_H
 #define WINTERMUTE_SXARRAY_H
 
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/scriptables/SXDate.cpp b/engines/wintermute/base/scriptables/script_ext_date.cpp
similarity index 94%
rename from engines/wintermute/base/scriptables/SXDate.cpp
rename to engines/wintermute/base/scriptables/script_ext_date.cpp
index cd705cc9d4f..211c0d34f02 100644
--- a/engines/wintermute/base/scriptables/SXDate.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_date.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/SXDate.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_ext_date.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/scriptables/SXDate.h b/engines/wintermute/base/scriptables/script_ext_date.h
similarity index 94%
rename from engines/wintermute/base/scriptables/SXDate.h
rename to engines/wintermute/base/scriptables/script_ext_date.h
index df0641983f2..82f6af1f1db 100644
--- a/engines/wintermute/base/scriptables/SXDate.h
+++ b/engines/wintermute/base/scriptables/script_ext_date.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SXDATE_H
 
 #include "common/system.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/scriptables/SXFile.cpp b/engines/wintermute/base/scriptables/script_ext_file.cpp
similarity index 94%
rename from engines/wintermute/base/scriptables/SXFile.cpp
rename to engines/wintermute/base/scriptables/script_ext_file.cpp
index 1924a42d72a..58c0416b43d 100644
--- a/engines/wintermute/base/scriptables/SXFile.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_file.cpp
@@ -26,17 +26,17 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/system/SysClassRegistry.h"
-#include "engines/wintermute/system/SysClass.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
+#include "engines/wintermute/system/sys_class_registry.h"
+#include "engines/wintermute/system/sys_class.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/utils/utils.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/file/BFile.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/file/base_file.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/SXFile.h"
+#include "engines/wintermute/base/scriptables/script_ext_file.h"
 
 // Note: This code is completely untested, as I have yet to find a game that uses SXFile.
 
diff --git a/engines/wintermute/base/scriptables/SXFile.h b/engines/wintermute/base/scriptables/script_ext_file.h
similarity index 94%
rename from engines/wintermute/base/scriptables/SXFile.h
rename to engines/wintermute/base/scriptables/script_ext_file.h
index 709d1f43781..5a6811fe579 100644
--- a/engines/wintermute/base/scriptables/SXFile.h
+++ b/engines/wintermute/base/scriptables/script_ext_file.h
@@ -30,7 +30,7 @@
 #define WINTERMUTES_SXFILE_H
 
 
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
 #include "common/stream.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXMath.cpp b/engines/wintermute/base/scriptables/script_ext_math.cpp
similarity index 95%
rename from engines/wintermute/base/scriptables/SXMath.cpp
rename to engines/wintermute/base/scriptables/script_ext_math.cpp
index fb2838ee948..22b08087b7b 100644
--- a/engines/wintermute/base/scriptables/SXMath.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_math.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/base/scriptables/SXMath.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/script_ext_math.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
 #include "engines/wintermute/persistent.h"
 #include "common/math.h"
 #include <cmath>
diff --git a/engines/wintermute/base/scriptables/SXMath.h b/engines/wintermute/base/scriptables/script_ext_math.h
similarity index 93%
rename from engines/wintermute/base/scriptables/SXMath.h
rename to engines/wintermute/base/scriptables/script_ext_math.h
index 4389de611fd..422521233f1 100644
--- a/engines/wintermute/base/scriptables/SXMath.h
+++ b/engines/wintermute/base/scriptables/script_ext_math.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SXMATH_H
 
 
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/scriptables/SXMemBuffer.cpp b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
similarity index 94%
rename from engines/wintermute/base/scriptables/SXMemBuffer.cpp
rename to engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
index 9ac98ab11d2..df2bf188ff2 100644
--- a/engines/wintermute/base/scriptables/SXMemBuffer.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
@@ -26,11 +26,11 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/base/BScriptable.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/SXMemBuffer.h"
+#include "engines/wintermute/base/base_scriptable.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_ext_mem_buffer.h"
 #include "common/file.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXMemBuffer.h b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h
similarity index 94%
rename from engines/wintermute/base/scriptables/SXMemBuffer.h
rename to engines/wintermute/base/scriptables/script_ext_mem_buffer.h
index 09831bf4649..a9d78e50e4c 100644
--- a/engines/wintermute/base/scriptables/SXMemBuffer.h
+++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SXMEMBUFFER_H
 
 
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/scriptables/SxObject.cpp b/engines/wintermute/base/scriptables/script_ext_object.cpp
similarity index 88%
rename from engines/wintermute/base/scriptables/SxObject.cpp
rename to engines/wintermute/base/scriptables/script_ext_object.cpp
index ba961ed2ae2..cb0d32d1a33 100644
--- a/engines/wintermute/base/scriptables/SxObject.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_object.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "SxObject.h"
-#include "ScValue.h"
-#include "ScStack.h"
+#include "engines/wintermute/base/scriptables/script_ext_object.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/scriptables/SxObject.h b/engines/wintermute/base/scriptables/script_ext_object.h
similarity index 93%
rename from engines/wintermute/base/scriptables/SxObject.h
rename to engines/wintermute/base/scriptables/script_ext_object.h
index b4ec7c6cdeb..b4e869d5b34 100644
--- a/engines/wintermute/base/scriptables/SxObject.h
+++ b/engines/wintermute/base/scriptables/script_ext_object.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SXOBJECT_H
 
 
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/scriptables/SXString.cpp b/engines/wintermute/base/scriptables/script_ext_string.cpp
similarity index 93%
rename from engines/wintermute/base/scriptables/SXString.cpp
rename to engines/wintermute/base/scriptables/script_ext_string.cpp
index ed3d243cb0f..bd7541fadd1 100644
--- a/engines/wintermute/base/scriptables/SXString.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_string.cpp
@@ -26,13 +26,13 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
 #include "engines/wintermute/utils/utils.h"
-#include "engines/wintermute/base/scriptables/SXString.h"
-#include "engines/wintermute/base/scriptables/SXArray.h"
-#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/base/scriptables/script_ext_string.h"
+#include "engines/wintermute/base/scriptables/script_ext_array.h"
+#include "engines/wintermute/utils/string_util.h"
 #include "common/tokenizer.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXString.h b/engines/wintermute/base/scriptables/script_ext_string.h
similarity index 94%
rename from engines/wintermute/base/scriptables/SXString.h
rename to engines/wintermute/base/scriptables/script_ext_string.h
index 348595ad29c..52a1524dde4 100644
--- a/engines/wintermute/base/scriptables/SXString.h
+++ b/engines/wintermute/base/scriptables/script_ext_string.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SXSTRING_H
 
 
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/scriptables/ScStack.cpp b/engines/wintermute/base/scriptables/script_stack.cpp
similarity index 93%
rename from engines/wintermute/base/scriptables/ScStack.cpp
rename to engines/wintermute/base/scriptables/script_stack.cpp
index 252cd21dda2..188cb2d15c2 100644
--- a/engines/wintermute/base/scriptables/ScStack.cpp
+++ b/engines/wintermute/base/scriptables/script_stack.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/base_game.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/scriptables/ScStack.h b/engines/wintermute/base/scriptables/script_stack.h
similarity index 94%
rename from engines/wintermute/base/scriptables/ScStack.h
rename to engines/wintermute/base/scriptables/script_stack.h
index 22dae63060c..6460f901fe0 100644
--- a/engines/wintermute/base/scriptables/ScStack.h
+++ b/engines/wintermute/base/scriptables/script_stack.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SCSTACK_H
 
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 #include "engines/wintermute/coll_templ.h"
 #include "engines/wintermute/persistent.h"
 
diff --git a/engines/wintermute/base/scriptables/ScValue.cpp b/engines/wintermute/base/scriptables/script_value.cpp
similarity index 94%
rename from engines/wintermute/base/scriptables/ScValue.cpp
rename to engines/wintermute/base/scriptables/script_value.cpp
index f38a12fc7ae..da47ed299fd 100644
--- a/engines/wintermute/base/scriptables/ScValue.cpp
+++ b/engines/wintermute/base/scriptables/script_value.cpp
@@ -27,12 +27,12 @@
  */
 
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/base_scriptable.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/scriptables/ScValue.h b/engines/wintermute/base/scriptables/script_value.h
similarity index 95%
rename from engines/wintermute/base/scriptables/ScValue.h
rename to engines/wintermute/base/scriptables/script_value.h
index c66a60c22ad..eaee3ed773c 100644
--- a/engines/wintermute/base/scriptables/ScValue.h
+++ b/engines/wintermute/base/scriptables/script_value.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SCVALUE_H
 
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 #include "engines/wintermute/persistent.h"
 #include "engines/wintermute/dcscript.h"   // Added by ClassView
 #include "engines/wintermute/wme_debugger.h"
diff --git a/engines/wintermute/base/BSound.cpp b/engines/wintermute/base/sound/base_sound.cpp
similarity index 93%
rename from engines/wintermute/base/BSound.cpp
rename to engines/wintermute/base/sound/base_sound.cpp
index 2b54b395009..e1819e3c653 100644
--- a/engines/wintermute/base/BSound.cpp
+++ b/engines/wintermute/base/sound/base_sound.cpp
@@ -26,10 +26,10 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BSoundBuffer.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/sound/base_sound_buffer.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BSound.h b/engines/wintermute/base/sound/base_sound.h
similarity index 95%
rename from engines/wintermute/base/BSound.h
rename to engines/wintermute/base/sound/base_sound.h
index 9dc825e4ac0..ef521940901 100644
--- a/engines/wintermute/base/BSound.h
+++ b/engines/wintermute/base/sound/base_sound.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BSOUND_H
 #define WINTERMUTE_BSOUND_H
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 #include "engines/wintermute/dctypes.h"    // Added by ClassView
 #include "engines/wintermute/persistent.h"
 #include "audio/mixer.h"
diff --git a/engines/wintermute/base/BSoundBuffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp
similarity index 94%
rename from engines/wintermute/base/BSoundBuffer.cpp
rename to engines/wintermute/base/sound/base_sound_buffer.cpp
index 4808cc90079..a868f998233 100644
--- a/engines/wintermute/base/BSoundBuffer.cpp
+++ b/engines/wintermute/base/sound/base_sound_buffer.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BFile.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BSoundBuffer.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/file/base_file.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/sound/base_sound_buffer.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/utils/utils.h"
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
diff --git a/engines/wintermute/base/BSoundBuffer.h b/engines/wintermute/base/sound/base_sound_buffer.h
similarity index 94%
rename from engines/wintermute/base/BSoundBuffer.h
rename to engines/wintermute/base/sound/base_sound_buffer.h
index 9384670fbb9..a491bd49ad8 100644
--- a/engines/wintermute/base/BSoundBuffer.h
+++ b/engines/wintermute/base/sound/base_sound_buffer.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BSOUNDBUFFER_H
 
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 #include "audio/mixer.h"
 #include "common/stream.h"
 
diff --git a/engines/wintermute/base/BSoundMgr.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp
similarity index 91%
rename from engines/wintermute/base/BSoundMgr.cpp
rename to engines/wintermute/base/sound/base_sound_manager.cpp
index 66baa633e4d..c2174dea6aa 100644
--- a/engines/wintermute/base/BSoundMgr.cpp
+++ b/engines/wintermute/base/sound/base_sound_manager.cpp
@@ -27,13 +27,13 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BSoundBuffer.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/sound/base_sound_buffer.h"
 #include "engines/wintermute/wintermute.h"
 #include "common/config-manager.h"
 #include "audio/mixer.h"
diff --git a/engines/wintermute/base/BSoundMgr.h b/engines/wintermute/base/sound/base_sound_manager.h
similarity index 95%
rename from engines/wintermute/base/BSoundMgr.h
rename to engines/wintermute/base/sound/base_sound_manager.h
index a021abadaaf..2c05bbfcb8d 100644
--- a/engines/wintermute/base/BSoundMgr.h
+++ b/engines/wintermute/base/sound/base_sound_manager.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BSOUNDMGR_H
 
 #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 #include "audio/mixer.h"
 #include "common/array.h"
 
diff --git a/engines/wintermute/coll_templ.h b/engines/wintermute/coll_templ.h
index e0d7ad81328..865e60b447f 100644
--- a/engines/wintermute/coll_templ.h
+++ b/engines/wintermute/coll_templ.h
@@ -31,10 +31,12 @@
 
 
 #include <new>
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
 
 namespace WinterMute {
 
+// Quite the same as Common::Array, but with persistence-support.
+
 /////////////////////////////////////////////////////////////////////////////
 template<class TYPE>
 inline void DCConstructElements(TYPE *pElements, int nCount) {
diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp
index e3fbb15d3fc..0abe78fa35e 100644
--- a/engines/wintermute/detection.cpp
+++ b/engines/wintermute/detection.cpp
@@ -22,7 +22,7 @@
 
 #include "engines/advancedDetector.h"
 #include "engines/wintermute/wintermute.h"
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
 
 #include "common/config-manager.h"
 #include "common/error.h"
diff --git a/engines/wintermute/graphics/transparentSurface.cpp b/engines/wintermute/graphics/transparent_surface.cpp
similarity index 99%
rename from engines/wintermute/graphics/transparentSurface.cpp
rename to engines/wintermute/graphics/transparent_surface.cpp
index a99138ade69..6ab9c621d0d 100644
--- a/engines/wintermute/graphics/transparentSurface.cpp
+++ b/engines/wintermute/graphics/transparent_surface.cpp
@@ -25,7 +25,7 @@
 #include "common/rect.h"
 #include "common/textconsole.h"
 #include "graphics/primitives.h"
-#include "engines/wintermute/graphics/transparentSurface.h"
+#include "engines/wintermute/graphics/transparent_surface.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/graphics/transparentSurface.h b/engines/wintermute/graphics/transparent_surface.h
similarity index 100%
rename from engines/wintermute/graphics/transparentSurface.h
rename to engines/wintermute/graphics/transparent_surface.h
diff --git a/engines/wintermute/math/MathUtil.cpp b/engines/wintermute/math/math_util.cpp
similarity index 94%
rename from engines/wintermute/math/MathUtil.cpp
rename to engines/wintermute/math/math_util.cpp
index 47b472d9cfd..d9449294fbc 100644
--- a/engines/wintermute/math/MathUtil.cpp
+++ b/engines/wintermute/math/math_util.cpp
@@ -26,7 +26,7 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "MathUtil.h"
+#include "engines/wintermute/math/math_util.h"
 #include <cmath>
 
 namespace WinterMute {
diff --git a/engines/wintermute/math/MathUtil.h b/engines/wintermute/math/math_util.h
similarity index 100%
rename from engines/wintermute/math/MathUtil.h
rename to engines/wintermute/math/math_util.h
diff --git a/engines/wintermute/math/Matrix4.cpp b/engines/wintermute/math/matrix4.cpp
similarity index 92%
rename from engines/wintermute/math/Matrix4.cpp
rename to engines/wintermute/math/matrix4.cpp
index 557f0d5c9a3..a716e937f40 100644
--- a/engines/wintermute/math/Matrix4.cpp
+++ b/engines/wintermute/math/matrix4.cpp
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/math/Matrix4.h"
-#include "engines/wintermute/math/Vector2.h"
+#include "engines/wintermute/math/matrix4.h"
+#include "engines/wintermute/math/vector2.h"
 #include <math.h>
 
 namespace WinterMute {
diff --git a/engines/wintermute/math/Matrix4.h b/engines/wintermute/math/matrix4.h
similarity index 100%
rename from engines/wintermute/math/Matrix4.h
rename to engines/wintermute/math/matrix4.h
diff --git a/engines/wintermute/math/Rect32.h b/engines/wintermute/math/rect32.h
similarity index 100%
rename from engines/wintermute/math/Rect32.h
rename to engines/wintermute/math/rect32.h
diff --git a/engines/wintermute/math/Vector2.cpp b/engines/wintermute/math/vector2.cpp
similarity index 94%
rename from engines/wintermute/math/Vector2.cpp
rename to engines/wintermute/math/vector2.cpp
index 8bd10320a8a..9906a59429e 100644
--- a/engines/wintermute/math/Vector2.cpp
+++ b/engines/wintermute/math/vector2.cpp
@@ -26,7 +26,7 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "Vector2.h"
+#include "engines/wintermute/math/vector2.h"
 #include <math.h>
 
 namespace WinterMute {
diff --git a/engines/wintermute/math/Vector2.h b/engines/wintermute/math/vector2.h
similarity index 100%
rename from engines/wintermute/math/Vector2.h
rename to engines/wintermute/math/vector2.h
diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
index 0063d072b18..3ad30cf66b2 100644
--- a/engines/wintermute/module.mk
+++ b/engines/wintermute/module.mk
@@ -1,119 +1,119 @@
 MODULE := engines/wintermute
  
 MODULE_OBJS := \
-	ad/AdActor.o \
-	ad/AdEntity.o \
-	ad/AdGame.o \
-	ad/AdInventory.o \
-	ad/AdInventoryBox.o \
-	ad/AdItem.o \
-	ad/AdLayer.o \
-	ad/AdNodeState.o \
-	ad/AdObject.o \
-	ad/AdPath.o \
-	ad/AdPathPoint.o \
-	ad/AdRegion.o \
-	ad/AdResponse.o \
-	ad/AdResponseBox.o \
-	ad/AdResponseContext.o \
-	ad/AdRotLevel.o \
-	ad/AdScaleLevel.o \
-	ad/AdScene.o \
-	ad/AdSceneNode.o \
-	ad/AdSceneState.o \
-	ad/AdSentence.o \
-	ad/AdSpriteSet.o \
-	ad/AdTalkDef.o \
-	ad/AdTalkHolder.o \
-	ad/AdTalkNode.o \
-	ad/AdWaypointGroup.o \
-	base/scriptables/ScEngine.o \
-	base/scriptables/ScScript.o \
-	base/scriptables/ScStack.o \
-	base/scriptables/ScValue.o \
-	base/scriptables/SXArray.o \
-	base/scriptables/SXDate.o \
-	base/scriptables/SXFile.o \
-	base/scriptables/SXMath.o \
-	base/scriptables/SxObject.o \
-	base/scriptables/SXMemBuffer.o \
-	base/scriptables/SXString.o \
-	base/file/BDiskFile.o \
-	base/file/BFile.o \
-	base/file/BFileEntry.o \
-	base/file/BPackage.o \
-	base/file/BSaveThumbFile.o \
+	ad/ad_actor.o \
+	ad/ad_entity.o \
+	ad/ad_game.o \
+	ad/ad_inventory.o \
+	ad/ad_inventory_box.o \
+	ad/ad_item.o \
+	ad/ad_layer.o \
+	ad/ad_node_state.o \
+	ad/ad_object.o \
+	ad/ad_path.o \
+	ad/ad_path_point.o \
+	ad/ad_region.o \
+	ad/ad_response.o \
+	ad/ad_response_box.o \
+	ad/ad_response_context.o \
+	ad/ad_rot_level.o \
+	ad/ad_scale_level.o \
+	ad/ad_scene.o \
+	ad/ad_scene_node.o \
+	ad/ad_scene_state.o \
+	ad/ad_sentence.o \
+	ad/ad_sprite_set.o \
+	ad/ad_talk_def.o \
+	ad/ad_talk_holder.o \
+	ad/ad_talk_node.o \
+	ad/ad_waypoint_group.o \
+	base/scriptables/script.o \
+	base/scriptables/script_engine.o \
+	base/scriptables/script_stack.o \
+	base/scriptables/script_value.o \
+	base/scriptables/script_ext_array.o \
+	base/scriptables/script_ext_date.o \
+	base/scriptables/script_ext_file.o \
+	base/scriptables/script_ext_math.o \
+	base/scriptables/script_ext_object.o \
+	base/scriptables/script_ext_mem_buffer.o \
+	base/scriptables/script_ext_string.o \
+	base/file/base_disk_file.o \
+	base/file/base_file.o \
+	base/file/base_file_entry.o \
+	base/file/base_package.o \
+	base/file/base_resources.o \
+	base/file/base_save_thumb_file.o \
 	base/file/BPkgFile.o \
-	base/font/BFontBitmap.o \
-	base/font/BFontTT.o \
-	base/font/BFont.o \
-	base/font/BFontStorage.o \
+	base/font/base_font_bitmap.o \
+	base/font/base_font_truetype.o \
+	base/font/base_font.o \
+	base/font/base_font_storage.o \
 	base/gfx/base_image.o \
 	base/gfx/base_renderer.o \
 	base/gfx/base_surface.o \
 	base/gfx/osystem/base_surface_osystem.o \
 	base/gfx/osystem/base_render_osystem.o \
-	base/particles/PartParticle.o \
-	base/particles/PartEmitter.o \
-	base/particles/PartForce.o \
-	base/BActiveRect.o \
-	base/BBase.o \
-	base/BDebugger.o \
-	base/BDynBuffer.o \
-	base/BFader.o \
-	base/BFileManager.o \
-	base/BGame.o \
-	base/BFrame.o \
-	base/BKeyboardState.o \
-	base/BNamedObject.o \
-	base/BObject.o \
-	base/BParser.o \
-	base/BPersistMgr.o \
-	base/BPoint.o \
-	base/BQuickMsg.o \
-	base/BRegion.o \
-	base/BRegistry.o \
-	base/BResources.o \
-	base/BSaveThumbHelper.o \
-	base/BScriptable.o \
-	base/BScriptHolder.o \
-	base/BSound.o \
-	base/BSoundBuffer.o \
-	base/BSoundMgr.o \
-	base/BSprite.o \
-	base/BStringTable.o \
-	base/BSubFrame.o \
-	base/BSurfaceStorage.o \
-	base/BTransitionMgr.o \
-	base/BViewport.o \
+	base/particles/part_particle.o \
+	base/particles/part_emitter.o \
+	base/particles/part_force.o \
+	base/sound/base_sound.o \
+	base/sound/base_sound_buffer.o \
+	base/sound/base_sound_manager.o \
+	base/base_active_rect.o \
+	base/base.o \
+	base/base_debugger.o \
+	base/base_dynamic_buffer.o \
+	base/base_fader.o \
+	base/base_file_manager.o \
+	base/base_game.o \
+	base/base_frame.o \
+	base/base_keyboard_state.o \
+	base/base_named_object.o \
+	base/base_object.o \
+	base/base_parser.o \
+	base/base_persistence_manager.o \
+	base/base_point.o \
+	base/base_quick_msg.o \
+	base/base_region.o \
+	base/base_registry.o \
+	base/base_save_thumb_helper.o \
+	base/base_scriptable.o \
+	base/base_script_holder.o \
+	base/base_sprite.o \
+	base/base_string_table.o \
+	base/base_sub_frame.o \
+	base/base_surface_storage.o \
+	base/base_transition_manager.o \
+	base/base_viewport.o \
 	detection.o \
-	graphics/transparentSurface.o \
+	graphics/transparent_surface.o \
 	graphics/tga.o \
-	math/MathUtil.o \
-	math/Matrix4.o \
-	math/Vector2.o \
+	math/math_util.o \
+	math/matrix4.o \
+	math/vector2.o \
 	platform_osystem.o \
-	system/SysClass.o \
-	system/SysClassRegistry.o \
-	system/SysInstance.o \
+	system/sys_class.o \
+	system/sys_class_registry.o \
+	system/sys_instance.o \
 	tinyxml/tinyxml.o \
 	tinyxml/tinystr.o \
 	tinyxml/tinyxmlparser.o \
 	tinyxml/tinyxmlerror.o \
-	ui/UIButton.o \
-	ui/UIEdit.o \
-	ui/UIEntity.o \
-	ui/UIObject.o \
-	ui/UIText.o \
-	ui/UITiledImage.o \
-	ui/UIWindow.o \
-	utils/ConvertUTF.o \
+	ui/ui_button.o \
+	ui/ui_edit.o \
+	ui/ui_entity.o \
+	ui/ui_object.o \
+	ui/ui_text.o \
+	ui/ui_tiled_image.o \
+	ui/ui_window.o \
+	utils/convert_utf.o \
 	utils/crc.o \
-	utils/PathUtil.o \
-	utils/StringUtil.o \
+	utils/path_util.o \
+	utils/string_util.o \
 	utils/utils.o \
-	video/VidPlayer.o \
-	video/VidTheoraPlayer.o \
+	video/video_player.o \
+	video/video_theora_player.o \
 	video/decoders/theora_decoder.o \
 	wintermute.o \
 	persistent.o
diff --git a/engines/wintermute/persistent.cpp b/engines/wintermute/persistent.cpp
index 10c21323267..57997405ded 100644
--- a/engines/wintermute/persistent.cpp
+++ b/engines/wintermute/persistent.cpp
@@ -26,67 +26,67 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/ad/AdActor.h"
-#include "engines/wintermute/ad/AdEntity.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdInventory.h"
-#include "engines/wintermute/ad/AdInventoryBox.h"
-#include "engines/wintermute/ad/AdItem.h"
-#include "engines/wintermute/ad/AdLayer.h"
-#include "engines/wintermute/ad/AdNodeState.h"
-#include "engines/wintermute/ad/AdObject.h"
-#include "engines/wintermute/ad/AdPath.h"
-#include "engines/wintermute/ad/AdPathPoint.h"
-#include "engines/wintermute/ad/AdRegion.h"
-#include "engines/wintermute/ad/AdResponse.h"
-#include "engines/wintermute/ad/AdResponseBox.h"
-#include "engines/wintermute/ad/AdResponseContext.h"
-#include "engines/wintermute/ad/AdRotLevel.h"
-#include "engines/wintermute/ad/AdScaleLevel.h"
-#include "engines/wintermute/ad/AdScene.h"
-#include "engines/wintermute/ad/AdSceneNode.h"
-#include "engines/wintermute/ad/AdSceneState.h"
-#include "engines/wintermute/ad/AdSentence.h"
-#include "engines/wintermute/ad/AdSpriteSet.h"
-#include "engines/wintermute/ad/AdTalkDef.h"
-#include "engines/wintermute/ad/AdTalkHolder.h"
-#include "engines/wintermute/ad/AdTalkNode.h"
-#include "engines/wintermute/ad/AdWaypointGroup.h"
-#include "engines/wintermute/base/BFader.h"
-#include "engines/wintermute/base/font/BFontBitmap.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFontTT.h"
-#include "engines/wintermute/base/BFrame.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BKeyboardState.h"
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/base/BPoint.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BScriptable.h"
-#include "engines/wintermute/base/BScriptHolder.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/BViewport.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/SXArray.h"
-#include "engines/wintermute/base/scriptables/SXDate.h"
-#include "engines/wintermute/base/scriptables/SXFile.h"
-#include "engines/wintermute/base/scriptables/SXMath.h"
-#include "engines/wintermute/base/scriptables/SXMemBuffer.h"
-#include "engines/wintermute/base/scriptables/SxObject.h"
-#include "engines/wintermute/base/scriptables/SXString.h"
-#include "engines/wintermute/ui/UIButton.h"
-#include "engines/wintermute/ui/UIEdit.h"
-#include "engines/wintermute/ui/UIEntity.h"
-#include "engines/wintermute/ui/UIText.h"
-#include "engines/wintermute/ui/UITiledImage.h"
-#include "engines/wintermute/ui/UIWindow.h"
-#include "engines/wintermute/video/VidTheoraPlayer.h"
-#include "engines/wintermute/system/SysClass.h"
+#include "engines/wintermute/ad/ad_actor.h"
+#include "engines/wintermute/ad/ad_entity.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_inventory.h"
+#include "engines/wintermute/ad/ad_inventory_box.h"
+#include "engines/wintermute/ad/ad_item.h"
+#include "engines/wintermute/ad/ad_layer.h"
+#include "engines/wintermute/ad/ad_node_state.h"
+#include "engines/wintermute/ad/ad_object.h"
+#include "engines/wintermute/ad/ad_path.h"
+#include "engines/wintermute/ad/ad_path_point.h"
+#include "engines/wintermute/ad/ad_region.h"
+#include "engines/wintermute/ad/ad_response.h"
+#include "engines/wintermute/ad/ad_response_box.h"
+#include "engines/wintermute/ad/ad_response_context.h"
+#include "engines/wintermute/ad/ad_rot_level.h"
+#include "engines/wintermute/ad/ad_scale_level.h"
+#include "engines/wintermute/ad/ad_scene.h"
+#include "engines/wintermute/ad/ad_scene_node.h"
+#include "engines/wintermute/ad/ad_scene_state.h"
+#include "engines/wintermute/ad/ad_sentence.h"
+#include "engines/wintermute/ad/ad_sprite_set.h"
+#include "engines/wintermute/ad/ad_talk_def.h"
+#include "engines/wintermute/ad/ad_talk_holder.h"
+#include "engines/wintermute/ad/ad_talk_node.h"
+#include "engines/wintermute/ad/ad_waypoint_group.h"
+#include "engines/wintermute/base/base_Fader.h"
+#include "engines/wintermute/base/font/base_font_bitmap.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font_truetype.h"
+#include "engines/wintermute/base/base_frame.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_Keyboard_state.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/base/base_point.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_scriptable.h"
+#include "engines/wintermute/base/base_script_holder.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_viewport.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_ext_array.h"
+#include "engines/wintermute/base/scriptables/script_ext_date.h"
+#include "engines/wintermute/base/scriptables/script_ext_file.h"
+#include "engines/wintermute/base/scriptables/script_ext_math.h"
+#include "engines/wintermute/base/scriptables/script_ext_mem_buffer.h"
+#include "engines/wintermute/base/scriptables/script_ext_object.h"
+#include "engines/wintermute/base/scriptables/script_ext_string.h"
+#include "engines/wintermute/ui/ui_button.h"
+#include "engines/wintermute/ui/ui_edit.h"
+#include "engines/wintermute/ui/ui_entity.h"
+#include "engines/wintermute/ui/ui_text.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
+#include "engines/wintermute/ui/ui_window.h"
+#include "engines/wintermute/video/video_theora_player.h"
+#include "engines/wintermute/system/sys_class.h"
 
 // CSysClass adds these objects to the registry, thus they aren't as leaked as they look
 #define REGISTER_CLASS(class_name, persistent_class)\
diff --git a/engines/wintermute/persistent.h b/engines/wintermute/persistent.h
index a7d028b911f..a5dac465b36 100644
--- a/engines/wintermute/persistent.h
+++ b/engines/wintermute/persistent.h
@@ -39,7 +39,7 @@ typedef bool(*PERSISTLOAD)(void *, CBPersistMgr *);
 typedef void (*SYS_INSTANCE_CALLBACK)(void *Instance, void *Data);
 } // end of namespace WinterMute
 
-#include "engines/wintermute/system/SysClassRegistry.h"
+#include "engines/wintermute/system/sys_class_registry.h"
 namespace WinterMute {
 
 
diff --git a/engines/wintermute/platform_osystem.cpp b/engines/wintermute/platform_osystem.cpp
index 82b53da723b..2be73b7256a 100644
--- a/engines/wintermute/platform_osystem.cpp
+++ b/engines/wintermute/platform_osystem.cpp
@@ -27,13 +27,13 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/gfx/osystem/base_render_osystem.h"
-#include "engines/wintermute/utils/PathUtil.h"
+#include "engines/wintermute/utils/path_util.h"
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
 #include "common/str.h"
 #include "common/textconsole.h"
 #include "common/system.h"
diff --git a/engines/wintermute/platform_osystem.h b/engines/wintermute/platform_osystem.h
index e0314898bf3..50b07bccb8b 100644
--- a/engines/wintermute/platform_osystem.h
+++ b/engines/wintermute/platform_osystem.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_PLATFORMSDL_H
 
 #include "engines/wintermute/dctypes.h"
-#include "engines/wintermute/math/Rect32.h"
+#include "engines/wintermute/math/rect32.h"
 #include "engines/wintermute/wintypes.h"
 #include "common/events.h"
 
diff --git a/engines/wintermute/system/SysClass.cpp b/engines/wintermute/system/sys_class.cpp
similarity index 93%
rename from engines/wintermute/system/SysClass.cpp
rename to engines/wintermute/system/sys_class.cpp
index 2d1066ab5ad..be70f8b8bdf 100644
--- a/engines/wintermute/system/SysClass.cpp
+++ b/engines/wintermute/system/sys_class.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/persistent.h"
-#include "SysInstance.h"
-#include "SysClass.h"
-#include "SysClassRegistry.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/system/sys_instance.h"
+#include "engines/wintermute/system/sys_class.h"
+#include "engines/wintermute/system/sys_class_registry.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/system/SysClass.h b/engines/wintermute/system/sys_class.h
similarity index 100%
rename from engines/wintermute/system/SysClass.h
rename to engines/wintermute/system/sys_class.h
diff --git a/engines/wintermute/system/SysClassRegistry.cpp b/engines/wintermute/system/sys_class_registry.cpp
similarity index 94%
rename from engines/wintermute/system/SysClassRegistry.cpp
rename to engines/wintermute/system/sys_class_registry.cpp
index 3260fd3d5ff..ce14b01385b 100644
--- a/engines/wintermute/system/SysClassRegistry.cpp
+++ b/engines/wintermute/system/sys_class_registry.cpp
@@ -26,12 +26,12 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "engines/wintermute/wintermute.h"
-#include "SysInstance.h"
-#include "SysClassRegistry.h"
-#include "engines/wintermute/system/SysClass.h"
+#include "engines/wintermute/system/sys_instance.h"
+#include "engines/wintermute/system/sys_class_registry.h"
+#include "engines/wintermute/system/sys_class.h"
 #include "common/stream.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/system/SysClassRegistry.h b/engines/wintermute/system/sys_class_registry.h
similarity index 95%
rename from engines/wintermute/system/SysClassRegistry.h
rename to engines/wintermute/system/sys_class_registry.h
index c9c4e8c0725..e17ae9bf787 100644
--- a/engines/wintermute/system/SysClassRegistry.h
+++ b/engines/wintermute/system/sys_class_registry.h
@@ -32,7 +32,7 @@
 #include "engines/wintermute/wintypes.h"
 #include "engines/wintermute/dctypes.h"
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/system/SysClass.h"
+#include "engines/wintermute/system/sys_class.h"
 #include "common/hashmap.h"
 #include "common/hash-str.h"
 #include "common/func.h"
diff --git a/engines/wintermute/system/SysInstance.cpp b/engines/wintermute/system/sys_instance.cpp
similarity index 87%
rename from engines/wintermute/system/SysInstance.cpp
rename to engines/wintermute/system/sys_instance.cpp
index b7f60799121..c34c3cc64a2 100644
--- a/engines/wintermute/system/SysInstance.cpp
+++ b/engines/wintermute/system/sys_instance.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "SysInstance.h"
-#include "SysClassRegistry.h"
-#include "SysClass.h"
+#include "engines/wintermute/system/sys_instance.h"
+#include "engines/wintermute/system/sys_class_registry.h"
+#include "engines/wintermute/system/sys_class.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/system/SysInstance.h b/engines/wintermute/system/sys_instance.h
similarity index 100%
rename from engines/wintermute/system/SysInstance.h
rename to engines/wintermute/system/sys_instance.h
diff --git a/engines/wintermute/ui/UIButton.cpp b/engines/wintermute/ui/ui_button.cpp
similarity index 94%
rename from engines/wintermute/ui/UIButton.cpp
rename to engines/wintermute/ui/ui_button.cpp
index 273f923376c..5b1867b652e 100644
--- a/engines/wintermute/ui/UIButton.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -27,21 +27,21 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/ui/UIButton.h"
-#include "engines/wintermute/ui/UITiledImage.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/ui/ui_button.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ui/UIButton.h b/engines/wintermute/ui/ui_button.h
similarity index 95%
rename from engines/wintermute/ui/UIButton.h
rename to engines/wintermute/ui/ui_button.h
index 5bdc075ebce..c6538f44234 100644
--- a/engines/wintermute/ui/UIButton.h
+++ b/engines/wintermute/ui/ui_button.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_UIBUTTON_H
 
 
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
 #include "engines/wintermute/dctypes.h"    // Added by ClassView
 
 namespace WinterMute {
diff --git a/engines/wintermute/ui/UIEdit.cpp b/engines/wintermute/ui/ui_edit.cpp
similarity index 93%
rename from engines/wintermute/ui/UIEdit.cpp
rename to engines/wintermute/ui/ui_edit.cpp
index 610853d8cb2..237b944332e 100644
--- a/engines/wintermute/ui/UIEdit.cpp
+++ b/engines/wintermute/ui/ui_edit.cpp
@@ -26,24 +26,24 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/ui/UIEdit.h"
-#include "engines/wintermute/ui/UIObject.h"
-#include "engines/wintermute/ui/UITiledImage.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/BKeyboardState.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/ui/ui_edit.h"
+#include "engines/wintermute/ui/ui_object.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/base_keyboard_state.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/utils/utils.h"
 #include "common/util.h"
 #include "common/keyboard.h"
diff --git a/engines/wintermute/ui/UIEdit.h b/engines/wintermute/ui/ui_edit.h
similarity index 95%
rename from engines/wintermute/ui/UIEdit.h
rename to engines/wintermute/ui/ui_edit.h
index 72493015927..400cd7b5780 100644
--- a/engines/wintermute/ui/UIEdit.h
+++ b/engines/wintermute/ui/ui_edit.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_UIEDIT_H
 
 #include "engines/wintermute/persistent.h"
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
 #include "common/events.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/ui/UIEntity.cpp b/engines/wintermute/ui/ui_entity.cpp
similarity index 91%
rename from engines/wintermute/ui/UIEntity.cpp
rename to engines/wintermute/ui/ui_entity.cpp
index 7fbd2d13ffc..012ff0390f0 100644
--- a/engines/wintermute/ui/UIEntity.cpp
+++ b/engines/wintermute/ui/ui_entity.cpp
@@ -26,15 +26,15 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/ad/AdEntity.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/ui/UIEntity.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/ad/ad_entity.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/ui/ui_entity.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ui/UIEntity.h b/engines/wintermute/ui/ui_entity.h
similarity index 94%
rename from engines/wintermute/ui/UIEntity.h
rename to engines/wintermute/ui/ui_entity.h
index b0711838a58..68730006814 100644
--- a/engines/wintermute/ui/UIEntity.h
+++ b/engines/wintermute/ui/ui_entity.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_UIENTITY_H
 #define WINTERMUTE_UIENTITY_H
 
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
 
 namespace WinterMute {
 class CAdEntity;
diff --git a/engines/wintermute/ui/UIObject.cpp b/engines/wintermute/ui/ui_object.cpp
similarity index 94%
rename from engines/wintermute/ui/UIObject.cpp
rename to engines/wintermute/ui/ui_object.cpp
index 8b3dc195371..605b5b74b1d 100644
--- a/engines/wintermute/ui/UIObject.cpp
+++ b/engines/wintermute/ui/ui_object.cpp
@@ -26,15 +26,15 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/ui/UIObject.h"
-#include "engines/wintermute/ui/UITiledImage.h"
-#include "engines/wintermute/ui/UIWindow.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/ui/ui_object.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
+#include "engines/wintermute/ui/ui_window.h"
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ui/UIObject.h b/engines/wintermute/ui/ui_object.h
similarity index 95%
rename from engines/wintermute/ui/UIObject.h
rename to engines/wintermute/ui/ui_object.h
index 26eecefe890..35bd092592b 100644
--- a/engines/wintermute/ui/UIObject.h
+++ b/engines/wintermute/ui/ui_object.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_UIOBJECT_H
 
 
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
 #include "engines/wintermute/dctypes.h"    // Added by ClassView
 
 namespace WinterMute {
diff --git a/engines/wintermute/ui/UIText.cpp b/engines/wintermute/ui/ui_text.cpp
similarity index 91%
rename from engines/wintermute/ui/UIText.cpp
rename to engines/wintermute/ui/ui_text.cpp
index a496483f674..6309d05a1ed 100644
--- a/engines/wintermute/ui/UIText.cpp
+++ b/engines/wintermute/ui/ui_text.cpp
@@ -27,19 +27,19 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/ui/UIText.h"
-#include "engines/wintermute/ui/UITiledImage.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/ui/ui_text.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/platform_osystem.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/ui/UIText.h b/engines/wintermute/ui/ui_text.h
similarity index 94%
rename from engines/wintermute/ui/UIText.h
rename to engines/wintermute/ui/ui_text.h
index 62fbf00b0ad..dc633dc0429 100644
--- a/engines/wintermute/ui/UIText.h
+++ b/engines/wintermute/ui/ui_text.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_UITEXT_H
 
 
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/ui/UITiledImage.cpp b/engines/wintermute/ui/ui_tiled_image.cpp
similarity index 94%
rename from engines/wintermute/ui/UITiledImage.cpp
rename to engines/wintermute/ui/ui_tiled_image.cpp
index 04a2cfca584..39b39b556d2 100644
--- a/engines/wintermute/ui/UITiledImage.cpp
+++ b/engines/wintermute/ui/ui_tiled_image.cpp
@@ -27,13 +27,13 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ui/UITiledImage.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/platform_osystem.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/ui/UITiledImage.h b/engines/wintermute/ui/ui_tiled_image.h
similarity index 94%
rename from engines/wintermute/ui/UITiledImage.h
rename to engines/wintermute/ui/ui_tiled_image.h
index 379af85e818..79adf7caac9 100644
--- a/engines/wintermute/ui/UITiledImage.h
+++ b/engines/wintermute/ui/ui_tiled_image.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_UITILEDIMAGE_H
 
 
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
 #include "common/rect.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/ui/UIWindow.cpp b/engines/wintermute/ui/ui_window.cpp
similarity index 94%
rename from engines/wintermute/ui/UIWindow.cpp
rename to engines/wintermute/ui/ui_window.cpp
index 35330e720ea..269744a3c29 100644
--- a/engines/wintermute/ui/UIWindow.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -27,25 +27,25 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ui/UIWindow.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BKeyboardState.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/ui/UIButton.h"
-#include "engines/wintermute/ui/UIEdit.h"
-#include "engines/wintermute/ui/UIText.h"
-#include "engines/wintermute/ui/UITiledImage.h"
-#include "engines/wintermute/base/BViewport.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_keyboard_state.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/ui/ui_button.h"
+#include "engines/wintermute/ui/ui_edit.h"
+#include "engines/wintermute/ui/ui_text.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
+#include "engines/wintermute/ui/ui_window.h"
+#include "engines/wintermute/base/base_viewport.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/platform_osystem.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/ui/UIWindow.h b/engines/wintermute/ui/ui_window.h
similarity index 95%
rename from engines/wintermute/ui/UIWindow.h
rename to engines/wintermute/ui/ui_window.h
index f1d46711ff7..6fe24c6a2cb 100644
--- a/engines/wintermute/ui/UIWindow.h
+++ b/engines/wintermute/ui/ui_window.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_UIWINDOW_H
 
 
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
 #include "common/events.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/utils/ConvertUTF.cpp b/engines/wintermute/utils/convert_utf.cpp
similarity index 99%
rename from engines/wintermute/utils/ConvertUTF.cpp
rename to engines/wintermute/utils/convert_utf.cpp
index 8f7d6d2124d..db0c0fa9f91 100644
--- a/engines/wintermute/utils/ConvertUTF.cpp
+++ b/engines/wintermute/utils/convert_utf.cpp
@@ -39,7 +39,7 @@
 ------------------------------------------------------------------------ */
 
 
-#include "ConvertUTF.h"
+#include "engines/wintermute/utils/convert_utf.h"
 #ifdef CVTUTF_DEBUG
 #include <stdio.h>
 #endif
diff --git a/engines/wintermute/utils/ConvertUTF.h b/engines/wintermute/utils/convert_utf.h
similarity index 100%
rename from engines/wintermute/utils/ConvertUTF.h
rename to engines/wintermute/utils/convert_utf.h
diff --git a/engines/wintermute/utils/crc.cpp b/engines/wintermute/utils/crc.cpp
index 0bce1c4c51d..933857e066b 100644
--- a/engines/wintermute/utils/crc.cpp
+++ b/engines/wintermute/utils/crc.cpp
@@ -15,7 +15,7 @@
  * expressed or implied by its publication or distribution.
  **********************************************************************/
 
-#include "crc.h"
+#include "engines/wintermute/utils/crc.h"
 
 
 /*
diff --git a/engines/wintermute/utils/PathUtil.cpp b/engines/wintermute/utils/path_util.cpp
similarity index 95%
rename from engines/wintermute/utils/PathUtil.cpp
rename to engines/wintermute/utils/path_util.cpp
index 7fa06cf6821..6b6b2d6b963 100644
--- a/engines/wintermute/utils/PathUtil.cpp
+++ b/engines/wintermute/utils/path_util.cpp
@@ -28,8 +28,8 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "common/file.h"
-#include "PathUtil.h"
-#include "StringUtil.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/utils/string_util.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/utils/PathUtil.h b/engines/wintermute/utils/path_util.h
similarity index 100%
rename from engines/wintermute/utils/PathUtil.h
rename to engines/wintermute/utils/path_util.h
diff --git a/engines/wintermute/utils/StringUtil.cpp b/engines/wintermute/utils/string_util.cpp
similarity index 96%
rename from engines/wintermute/utils/StringUtil.cpp
rename to engines/wintermute/utils/string_util.cpp
index 303e7b11314..c3fcb09f1d5 100644
--- a/engines/wintermute/utils/StringUtil.cpp
+++ b/engines/wintermute/utils/string_util.cpp
@@ -28,8 +28,8 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "common/tokenizer.h"
-#include "StringUtil.h"
-#include "ConvertUTF.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/utils/convert_utf.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/utils/StringUtil.h b/engines/wintermute/utils/string_util.h
similarity index 100%
rename from engines/wintermute/utils/StringUtil.h
rename to engines/wintermute/utils/string_util.h
diff --git a/engines/wintermute/utils/utils.cpp b/engines/wintermute/utils/utils.cpp
index 17357321854..e77f35a0e82 100644
--- a/engines/wintermute/utils/utils.cpp
+++ b/engines/wintermute/utils/utils.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "utils.h"
+#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "engines/wintermute/wintypes.h"
-#include "PathUtil.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/base/base_game.h"
 #include "common/str.h"
 #include "common/textconsole.h"
 #include "engines/wintermute/wintermute.h"
diff --git a/engines/wintermute/utils/utils.h b/engines/wintermute/utils/utils.h
index 14b8f4aa96b..c8ca2e121ca 100644
--- a/engines/wintermute/utils/utils.h
+++ b/engines/wintermute/utils/utils.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_UTILS_H
 
 #include "engines/wintermute/wintypes.h"
-#include "engines/wintermute/math/Rect32.h"
+#include "engines/wintermute/math/rect32.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/video/VidPlayer.cpp b/engines/wintermute/video/video_player.cpp
similarity index 99%
rename from engines/wintermute/video/VidPlayer.cpp
rename to engines/wintermute/video/video_player.cpp
index 93f3196eee9..49d1c6c50f4 100644
--- a/engines/wintermute/video/VidPlayer.cpp
+++ b/engines/wintermute/video/video_player.cpp
@@ -28,7 +28,7 @@
 
 
 #include "engines/wintermute/dcgf.h"
-#include "VidPlayer.h"
+#include "engines/wintermute/video/video_player.h"
 
 //#pragma comment(lib, "vfw32.lib")
 
diff --git a/engines/wintermute/video/VidPlayer.h b/engines/wintermute/video/video_player.h
similarity index 98%
rename from engines/wintermute/video/VidPlayer.h
rename to engines/wintermute/video/video_player.h
index a44482e4c68..ca6c7fdec5a 100644
--- a/engines/wintermute/video/VidPlayer.h
+++ b/engines/wintermute/video/video_player.h
@@ -34,7 +34,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
 
 #define MAX_AUDIO_STREAMS 5
 #define MAX_VIDEO_STREAMS 5
diff --git a/engines/wintermute/video/VidTheoraPlayer.cpp b/engines/wintermute/video/video_theora_player.cpp
similarity index 98%
rename from engines/wintermute/video/VidTheoraPlayer.cpp
rename to engines/wintermute/video/video_theora_player.cpp
index ffb24d22dd8..e3c120ff86c 100644
--- a/engines/wintermute/video/VidTheoraPlayer.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -28,13 +28,13 @@
 
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/video/VidTheoraPlayer.h"
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/video/video_theora_player.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h"
 #include "engines/wintermute/base/gfx/base_image.h"
-#include "engines/wintermute/base/BSoundMgr.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "engines/wintermute/video/decoders/theora_decoder.h"
diff --git a/engines/wintermute/video/VidTheoraPlayer.h b/engines/wintermute/video/video_theora_player.h
similarity index 97%
rename from engines/wintermute/video/VidTheoraPlayer.h
rename to engines/wintermute/video/video_theora_player.h
index f624c9a972f..5bf8e165c7c 100644
--- a/engines/wintermute/video/VidTheoraPlayer.h
+++ b/engines/wintermute/video/video_theora_player.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_VIDTHEORAPLAYER_H
 #define WINTERMUTE_VIDTHEORAPLAYER_H
 
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/base/file/BFile.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/base/file/base_file.h"
 #include "engines/wintermute/persistent.h"
 #include "video/video_decoder.h"
 #include "common/stream.h"
diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index 220e9f40578..2a651baabf3 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -31,13 +31,13 @@
 #include "common/fs.h"
 
 #include "engines/util.h"
-#include "engines/wintermute/ad/AdGame.h"
+#include "engines/wintermute/ad/ad_game.h"
 #include "engines/wintermute/wintermute.h"
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/BRegistry.h"
+#include "engines/wintermute/base/base_registry.h"
 
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
 
 namespace WinterMute {