rename -> ResidualVM

.gitignore

@@ -7,8 +7,8 @@ lib*.a
 .deps
 
 /config.log
-/residual
+/residualvm
-/residual-static
+/residualvm-static
 /config.h
 /config.mk
 /.gdb_history
@@ -32,16 +32,16 @@ lib*.a
 /dists/codeblocks/*.cbp
 /dists/codeblocks/*.depend
 /dists/codeblocks/*.layout
-/dists/codeblocks/residual*
+/dists/codeblocks/residualvm*
 
 #Ignore XCode user data and build files
 xcuserdata
 project.xcworkspace
 /dists/iphone/build
-/dists/iphone/residual.xcodeproj
+/dists/iphone/residualvm.xcodeproj
 /dists/iphone/create_project
 /dists/macosx/build
-/dists/macosx/residual.xcodeproj
+/dists/macosx/residualvm.xcodeproj
 /dists/macosx/create_project
 
 /dists/msvc*/[Dd]ebug*/
@@ -93,7 +93,7 @@ ipch/
 [Rr]elease*/
 
 #Ignore Qt Creator project files
-Residual.config
+ResidualVM.config
-Residual.creator
+ResidualVM.creator
-Residual.files
+ResidualVM.files
-Residual.includes
+ResidualVM.includes

AUTHORS

@@ -1,4 +1,4 @@
-Residual Team
+ResidualVM Team
 *************
   Project Leader
   --------------

COPYING.LGPL

@@ -1,4 +1,4 @@
-NOTE: Only certain parts of the Residual project are under the GNU LGPL.
+NOTE: Only certain parts of the ResidualVM project are under the GNU LGPL.
 The majority of the files are under the GNU GPL. See the headers of the
 individual files to find out the exact license.
 

COPYRIGHT

@@ -1,4 +1,4 @@
-Residual
+ResidualVM
 Copyright (C) 2003-2012 by the following:
 
 If you have contributed to this project then you deserve to be on this

Makefile

@@ -70,7 +70,7 @@ ZIP     ?= zip -q
 # Misc stuff - you should never have to edit this                     #
 #######################################################################
 
-EXECUTABLE  := $(EXEPRE)residual$(EXEEXT)
+EXECUTABLE  := $(EXEPRE)residualvm$(EXEEXT)
 
 include $(srcdir)/Makefile.common
 

Makefile.common

@@ -3,7 +3,7 @@
 #
 
 ######################################################################
-# The default build target: just build the residual executable
+# The default build target: just build the residualvm executable
 ######################################################################
 
 all: $(EXECUTABLE) plugins
@@ -75,7 +75,7 @@ endif
 endif
 endif
 
-# The build rule for the Residual executable
+# The build rule for the ResidualVM executable
 $(EXECUTABLE): $(OBJS)
 	$(QUIET_LINK)$(LD) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@
 
@@ -154,7 +154,7 @@ endif
 # Get the current version information
 ######################################################################
 
-VERSION = $(shell grep RESIDUAL_VERSION "${srcdir}/base/internal_version.h" | cut -d\" -f2)
+VERSION = $(shell grep RESIDUALVM_VERSION "${srcdir}/base/internal_version.h" | cut -d\" -f2)
 VER_MAJOR = $(shell echo $(VERSION) | cut -d. -f 1)
 VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2)
 VER_PATCH = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c1)
@@ -180,7 +180,7 @@ endif
 # Define the Subversion revision if available, either autodetected or
 # specified by the user, but only for base/version.cpp.
 ifneq ($(origin VER_REV), undefined)
-base/version.o: CXXFLAGS:=$(CXXFLAGS) -DRESIDUAL_REVISION=\"$(VER_REV)\"
+base/version.o: CXXFLAGS:=$(CXXFLAGS) -DRESIDUALVM_REVISION=\"$(VER_REV)\"
 endif
 
 ######################################################################
@@ -197,7 +197,7 @@ else
 DISTVERSION = $(VERSION)
 endif
 
-DISTNAME := residual-$(DISTVERSION)
+DISTNAME := residualvm-$(DISTVERSION)
 DISTDIR := dist
 VERFILE := $(DISTDIR)/$(DISTNAME)/base/internal_version.h
 
@@ -209,7 +209,7 @@ $(VERFILE): $(srcdir)/base/internal_version.h
 ifneq ($(origin VER_REV), undefined)
 	@# Use the current SVN revision as a default for the snapshot sources
 	@svn cat $(SVNROOT)/base/internal_version.h | sed -e \
-		"s/^#define RESIDUAL_REVISION$$/#define RESIDUAL_REVISION \"$(VER_REV)\"/g" \
+		"s/^#define RESIDUALVM_REVISION$$/#define RESIDUALVM_REVISION \"$(VER_REV)\"/g" \
 		> $(VERFILE)
 endif
 

README

@@ -1,4 +1,4 @@
-Residual: A 3D game interpreter
+ResidualVM: A 3D game interpreter
 
 Contents:
 1. What is Residual?
@@ -38,7 +38,7 @@ Grim Fandango                    - Completable with glitches
 Grim Fandango (demo)             - Completable with glitches
 
 Specifics can be found at
-http://residual.sourceforge.net/compatibility/
+http://www.residualvm.org/compatibility/
 
 * It is possible, but far from promised, that 'Escape from Monkey Island'
   may be supported in the distant future.
@@ -112,7 +112,7 @@ F1         : Menu
 -----------------
 5 - Configuration
 -----------------
-Currently, not all the settings for residual are available through the GUI,
+Currently, not all the settings for ResidualVM are available through the GUI,
 if you have problems with getting anything to work, first try to pass the settings
 from the command line, then, if that doesn't work, try to change your configuration file
 manually
@@ -131,7 +131,7 @@ By default, the configuration file is saved in, and loaded from:
         <windir>\Profiles\username\Application Data\Residual\residual.ini
 
         Windows 95/98/ME:
-       <windir>\residual.ini
+        <windir>\residual.ini
 
         Unix:
         ~/.residualrc
@@ -146,7 +146,7 @@ By default, the configuration file is saved in, and loaded from:
 ------------------------------------
 The following settings are currently available in the config-file,
 however some of them might not work with your current build. And 
-some of them might make residual crash, or behave in weird ways.
+some of them might make ResidualVM crash, or behave in weird ways.
 
 |-------------------|-------------|-----------------------------------------------------|
 |Setting            | Values      | Effect                                              |
@@ -222,7 +222,7 @@ Remember to always have the following information in your bug reports:
 ----------
 8. Contact
 ----------
-Homepage: http://residual.sourceforge.net/
+Homepage: http://www.residualvm.org/
 Wiki: http://sourceforge.net/apps/mediawiki/residual/index.php?title=Main_Page
 Forums: http://residual.scummvm.org/
 IRC: #residual on freenode
@@ -232,7 +232,7 @@ IRC: #residual on freenode
 9. Debugging
 ------------
 WARNING: This section contains information about the various tools that
-are included for debugging residual, this should not be necessary for
+are included for debugging ResidualVM, this should not be necessary for
 normal play at all. But the curious might like to know how. Use at your
 own risk.
 

audio/softsynth/mt32.cpp

@@ -135,7 +135,7 @@ static int eatSystemEvents() {
 }
 
 static void drawProgress(float progress) {
-	// TODO implement in Residual
+	// TODO implement in ResidualVM
 	/*const Graphics::Font &font(*FontMan.getFontByUsage(Graphics::FontManager::kOSDFont));
 	Graphics::Surface *screen = g_system->lockScreen();
 
@@ -176,7 +176,7 @@ static void drawProgress(float progress) {
 }
 
 static void drawMessage(int offset, const Common::String &text) {
-	// TODO implement in Residual
+	// TODO implement in ResidualVM
 	/* const Graphics::Font &font(*FontMan.getFontByUsage(Graphics::FontManager::kOSDFont));
 	Graphics::Surface *screen = g_system->lockScreen();
 
@@ -317,7 +317,7 @@ int MidiDriver_MT32::open() {
 
 	_synth = new MT32Emu::Synth();
 
-	// TODO implement in Residual
+	// TODO implement in ResidualVM
 	Graphics::PixelFormat screenFormat; /*= g_system->getScreenFormat();*/
 
 	if (screenFormat.bytesPerPixel == 1) {
@@ -327,7 +327,7 @@ int MidiDriver_MT32::open() {
 			171, 0, 0	// fill
 		};
 
-		// TODO implement in Residual
+		// TODO implement in ResidualVM
 		//g_system->setPalette(dummy_palette, 0, 3);
 	}
 
@@ -337,7 +337,7 @@ int MidiDriver_MT32::open() {
 		return MERR_DEVICE_NOT_AVAILABLE;
 	_initializing = false;
 
-	// TODO implement in Residual
+	// TODO implement in ResidualVM
 /*	if (screenFormat.bytesPerPixel > 1)
 		g_system->fillScreen(screenFormat.RGBToColor(0, 0, 0));
 	else
@@ -568,7 +568,7 @@ MusicDevices MT32EmuMusicPlugin::getDevices() const {
 bool MT32EmuMusicPlugin::checkDevice(MidiDriver::DeviceHandle) const {
 	if (!((Common::File::exists("MT32_CONTROL.ROM") && Common::File::exists("MT32_PCM.ROM")) ||
 		(Common::File::exists("CM32L_CONTROL.ROM") && Common::File::exists("CM32L_PCM.ROM")))) {
-			warning("The MT-32 emulator requires one of the two following file sets (not bundled with ScummVM):\n Either 'MT32_CONTROL.ROM' and 'MT32_PCM.ROM' or 'CM32L_CONTROL.ROM' and 'CM32L_PCM.ROM'");
+			warning("The MT-32 emulator requires one of the two following file sets (not bundled with ResidualVM):\n Either 'MT32_CONTROL.ROM' and 'MT32_PCM.ROM' or 'CM32L_CONTROL.ROM' and 'CM32L_PCM.ROM'");
 			return false;
 	}
 

backends/events/sdl/sdl-events.cpp

@@ -53,7 +53,7 @@ SdlEventSource::SdlEventSource()
     : _scrollLock(false), _joystick(0), _lastScreenID(0), EventSource() {
 	// Reset mouse state
 	memset(&_km, 0, sizeof(_km));
-/* Residual doesn't support this
+/* ResidualVM doesn't support this
 	int joystick_num = ConfMan.getInt("joystick_num");
 	if (joystick_num > -1) {
 		// Initialize SDL joystick subsystem
@@ -70,7 +70,7 @@ SdlEventSource::SdlEventSource()
 }
 
 SdlEventSource::~SdlEventSource() {
-/*	Residual doesn't support this
+/*	ResidualVM doesn't support this
 	if (_joystick)
 		SDL_JoystickClose(_joystick);*/
 }
@@ -165,7 +165,7 @@ void SdlEventSource::handleKbdMouse() {
 				_km.y_down_count = 1;
 			}
 
-			// Residual: disable wrap mouse for now, it's really annoying
+			// ResidualVM: disable wrap mouse for now, it's really annoying
 			//SDL_WarpMouse((Uint16)_km.x, (Uint16)_km.y);
 		}
 	}
@@ -198,7 +198,7 @@ void SdlEventSource::SDLModToOSystemKeyFlags(SDLMod mod, Common::Event &event) {
 
 bool SdlEventSource::pollEvent(Common::Event &event) {
 	handleKbdMouse();
-/* Residual doesn't support this
+/* ResidualVM doesn't support this
 	// If the screen changed, send an Common::EVENT_SCREEN_CHANGED
 	int screenID = ((OSystem_SDL *)g_system)->getGraphicsManager()->getScreenChangeID();
 	if (screenID != _lastScreenID) {

backends/log/log.cpp

@@ -44,9 +44,9 @@ void Log::open(Common::WriteStream *stream) {
 
 	// Output information about the ScummVM version at the start of the log
 	// file
-	print(gResidualFullVersion);
+	print(gResidualVMFullVersion);
 	print("\n");
-	print(gResidualFeatures);
+	print(gResidualVMFeatures);
 	print("\n");
 	print("--- Log opened.\n");
 	_startOfLine = true;

backends/midi/alsa.cpp

@@ -102,7 +102,7 @@ int MidiDriver_ALSA::open() {
 	}
 
 	my_client = snd_seq_client_id(seq_handle);
-	if (snd_seq_set_client_name(seq_handle, "RESIDUAL") < 0) {
+	if (snd_seq_set_client_name(seq_handle, "RESIDUALVM") < 0) {
 		error("Can't set sequencer client name");
 	}
 	snd_seq_set_client_group(seq_handle, "input");
@@ -113,7 +113,7 @@ int MidiDriver_ALSA::open() {
 	// to be able to record the sound, but I can't get that to work even
 	// with those capabilities.
 
-	my_port = snd_seq_create_simple_port(seq_handle, "RESIDUAL port 0", 0,
+	my_port = snd_seq_create_simple_port(seq_handle, "RESIDUALVM port 0", 0,
 	                                     SND_SEQ_PORT_TYPE_MIDI_GENERIC | SND_SEQ_PORT_TYPE_APPLICATION);
 
 	if (my_port < 0) {
@@ -433,9 +433,9 @@ Common::Error AlsaMusicPlugin::createInstance(MidiDriver **mididriver, MidiDrive
 	// The SCUMMVM_PORT environment variable can still be used to override
 	// any config setting.
 
-	var = getenv("RESIDUAL_PORT");
+	var = getenv("RESIDUALVM_PORT");
 	if (var) {
-		warning("AlsaMusicPlugin: RESIDUAL_PORT environment variable overrides config settings");
+		warning("AlsaMusicPlugin: RESIDUALVM_PORT environment variable overrides config settings");
 		if (parse_addr(var, &seq_client, &seq_port) >= 0) {
 			found = true;
 		} else {

backends/midi/camd.cpp

@@ -82,7 +82,7 @@ int MidiDriver_CAMD::open() {
 	}
 
 	struct MidiNode *midi_node;
-	midi_node = _ICamd->CreateMidi(MIDI_MsgQueue, 0L, MIDI_SysExSize, 4096L, MIDI_Name, "residual", TAG_END);
+	midi_node = _ICamd->CreateMidi(MIDI_MsgQueue, 0L, MIDI_SysExSize, 4096L, MIDI_Name, "residualvm", TAG_END);
 	if (!midi_node) {
 		closeAll();
 		error("Could not create CAMD MIDI node");

backends/midi/coremidi.cpp

@@ -70,7 +70,7 @@ MidiDriver_CoreMIDI::MidiDriver_CoreMIDI()
 	: mClient(0), mOutPort(0), mDest(0) {
 
 	OSStatus err;
-	err = MIDIClientCreate(CFSTR("Residual MIDI Driver for OS X"), NULL, NULL, &mClient);
+	err = MIDIClientCreate(CFSTR("ResidualVM MIDI Driver for OS X"), NULL, NULL, &mClient);
 }
 
 MidiDriver_CoreMIDI::~MidiDriver_CoreMIDI() {
@@ -91,7 +91,7 @@ int MidiDriver_CoreMIDI::open() {
 	if (dests > 0 && mClient) {
 		mDest = MIDIGetDestination(0);
 		err = MIDIOutputPortCreate( mClient,
-									CFSTR("residual_output_port"),
+									CFSTR("residualvm_output_port"),
 									&mOutPort);
 	} else {
 		return MERR_DEVICE_NOT_AVAILABLE;

backends/midi/dmedia.cpp

@@ -91,8 +91,8 @@ int MidiDriver_DMEDIA::open() {
 		return -1;
 	}
 
-	if (getenv("RESIDUAL_MIDIPORT")) {
+	if (getenv("RESIDUALVM_MIDIPORT")) {
-		_deviceNum = atoi(getenv("RESIDUAL_MIDIPORT"));
+		_deviceNum = atoi(getenv("RESIDUALVM_MIDIPORT"));
 		_midiportName = mdGetName(_deviceNum);
 	} else {
 		var = ConfMan.get("dmedia_port").c_str();

backends/midi/seq.cpp

@@ -79,10 +79,10 @@ int MidiDriver_SEQ::open() {
 	_isOpen = true;
 	device = 0;
 
-	device_name = getenv("RESIDUAL_MIDI");
+	device_name = getenv("RESIDUALVM_MIDI");
 
 	if (device_name == NULL) {
-		warning("RESIDUAL_MIDI environment variable not set, using /dev/sequencer");
+		warning("RESIDUALVM_MIDI environment variable not set, using /dev/sequencer");
 		device_name = dev_seq;
 	}
 
@@ -99,8 +99,8 @@ int MidiDriver_SEQ::open() {
 			error("Cannot open /dev/null to dump midi output");
 	}
 
-	if (getenv("RESIDUAL_MIDIPORT"))
+	if (getenv("RESIDUALVM_MIDIPORT"))
-		_device_num = atoi(getenv("RESIDUAL_MIDIPORT"));
+		_device_num = atoi(getenv("RESIDUALVM_MIDIPORT"));
 	return 0;
 }
 

backends/midi/timidity.cpp

@@ -231,8 +231,8 @@ int MidiDriver_TIMIDITY::open() {
 	/*
 	 * From seq.cpp
 	 */
-	if (getenv("RESIDUAL_MIDIPORT"))
+	if (getenv("RESIDUALVM_MIDIPORT"))
-		_device_num = atoi(getenv("RESIDUAL_MIDIPORT"));
+		_device_num = atoi(getenv("RESIDUALVM_MIDIPORT"));
 
 	return 0;
 }

backends/platform/sdl/amigaos/amigaos-main.cpp

@@ -41,8 +41,8 @@ int main(int argc, char *argv[]) {
 	PluginManager::instance().addPluginProvider(new SDLPluginProvider());
 #endif
 
-	// Invoke the actual Residual main entry point:
+	// Invoke the actual ResidualVM main entry point:
-	int res = residual_main(argc, argv);
+	int res = residualvm_main(argc, argv);
 
 	// Free OSystem
 	delete (OSystem_AmigaOS *)g_system;

backends/platform/sdl/macosx/appmenu_osx.mm

@@ -58,13 +58,13 @@ void replaceApplicationMenuItems() {
 #endif
 	
 	// Add "About ScummVM" menu item
-	[appleMenu addItemWithTitle:[NSString stringWithCString:_("About ScummVM") encoding:stringEncoding] action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
+	[appleMenu addItemWithTitle:[NSString stringWithCString:_("About ResidualVM") encoding:stringEncoding] action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
 
 	// Add separator
 	[appleMenu addItem:[NSMenuItem separatorItem]];
 
 	// Add "Hide ScummVM" menu item
-	[appleMenu addItemWithTitle:[NSString stringWithCString:_("Hide ScummVM") encoding:stringEncoding] action:@selector(hide:) keyEquivalent:@"h"];
+	[appleMenu addItemWithTitle:[NSString stringWithCString:_("Hide ResidualVM") encoding:stringEncoding] action:@selector(hide:) keyEquivalent:@"h"];
 
 	// Add "Hide Others" menu item
 	menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:[NSString stringWithCString:_("Hide Others") encoding:stringEncoding] action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
@@ -77,7 +77,7 @@ void replaceApplicationMenuItems() {
 	[appleMenu addItem:[NSMenuItem separatorItem]];
 
 	// Add "Quit ScummVM" menu item
-	[appleMenu addItemWithTitle:[NSString stringWithCString:_("Quit ScummVM") encoding:stringEncoding] action:@selector(terminate:) keyEquivalent:@"q"];
+	[appleMenu addItemWithTitle:[NSString stringWithCString:_("Quit ResidualVM") encoding:stringEncoding] action:@selector(terminate:) keyEquivalent:@"q"];
 
 	// Put application menu into the menubar
 	menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];

backends/platform/sdl/macosx/macosx-main.cpp

@@ -41,8 +41,8 @@ int main(int argc, char *argv[]) {
 	PluginManager::instance().addPluginProvider(new SDLPluginProvider());
 #endif
 
-	// Invoke the actual Residual main entry point:
+	// Invoke the actual ResidualVM main entry point:
-	int res = residual_main(argc, argv);
+	int res = residualvm_main(argc, argv);
 
 	// Free OSystem
 	delete (OSystem_MacOSX *)g_system;

backends/platform/sdl/main.cpp

@@ -54,8 +54,8 @@ int main(int argc, char *argv[]) {
 	PluginManager::instance().addPluginProvider(new SDLPluginProvider());
 #endif
 
-	// Invoke the actual Residual main entry point:
+	// Invoke the actual ResidualVM main entry point:
-	int res = residual_main(argc, argv);
+	int res = residualvm_main(argc, argv);
 
 	// Free OSystem
 	delete (OSystem_SDL *)g_system;

backends/platform/sdl/posix/posix-main.cpp

@@ -41,8 +41,8 @@ int main(int argc, char *argv[]) {
 	PluginManager::instance().addPluginProvider(new SDLPluginProvider());
 #endif
 
-	// Invoke the actual Residual main entry point:
+	// Invoke the actual ResidualVM main entry point:
-	int res = residual_main(argc, argv);
+	int res = residualvm_main(argc, argv);
 
 	// Free OSystem
 	delete (OSystem_POSIX *)g_system;

backends/platform/sdl/posix/posix.cpp

@@ -106,7 +106,7 @@ Common::WriteStream *OSystem_POSIX::createLogFile() {
 #ifdef MACOSX
 	logFile += "/Library";
 #else
-	logFile += "/.residual";
+	logFile += "/.residualvm";
 #endif
 #ifdef SAMSUNGTV
 	logFile = "/mtd_ram";
@@ -150,7 +150,7 @@ Common::WriteStream *OSystem_POSIX::createLogFile() {
 		return 0;
 	}
 
-	logFile += "/residual.log";
+	logFile += "/residualvm.log";
 
 	Common::FSNode file(logFile);
 	Common::WriteStream *stream = file.createWriteStream();

backends/platform/sdl/sdl.cpp

@@ -48,7 +48,7 @@
 #include "backends/timer/sdl/sdl-timer.h"
 #include "backends/graphics/surfacesdl/surfacesdl-graphics.h"
 
-#include "icons/residual.xpm"
+#include "icons/residualvm.xpm"
 
 #include <time.h>	// for getTimeAndDate()
 
@@ -363,8 +363,8 @@ void OSystem_SDL::setupIcon() {
 	unsigned int rgba[256];
 	unsigned int *icon;
 
-	if (sscanf(residual_icon[0], "%d %d %d %d", &w, &h, &ncols, &nbytes) != 4) {
+	if (sscanf(residualvm_icon[0], "%d %d %d %d", &w, &h, &ncols, &nbytes) != 4) {
-		warning("Wrong format of residual_icon[0] (%s)", residual_icon[0]);
+		warning("Wrong format of residual_icon[0] (%s)", residualvm_icon[0]);
 
 		return;
 	}
@@ -383,8 +383,8 @@ void OSystem_SDL::setupIcon() {
 		char color[32];
 		memset(color, 0, sizeof(color));
 		unsigned int col;
-		if (sscanf(residual_icon[1 + i], "%c c %s", &code, color) != 2) {
+		if (sscanf(residualvm_icon[1 + i], "%c c %s", &code, color) != 2) {
-			warning("Wrong format of residual_icon[%d] (%s)", 1 + i, residual_icon[1 + i]);
+			warning("Wrong format of residualvm_icon[%d] (%s)", 1 + i, residualvm_icon[1 + i]);
 		}
 		if (!strcmp(color, "None"))
 			col = 0x00000000;
@@ -396,7 +396,7 @@ void OSystem_SDL::setupIcon() {
 			}
 			col |= 0xFF000000;
 		} else {
-			warning("Could not load the built-in icon (%d %s - %s) ", code, color, residual_icon[1 + i]);
+			warning("Could not load the built-in icon (%d %s - %s) ", code, color, residualvm_icon[1 + i]);
 			free(icon);
 			return;
 		}
@@ -404,7 +404,7 @@ void OSystem_SDL::setupIcon() {
 		rgba[code] = col;
 	}
 	for (y = 0; y < h; y++) {
-		const char *line = residual_icon[1 + ncols + y];
+		const char *line = residualvm_icon[1 + ncols + y];
 		for (x = 0; x < w; x++) {
 			icon[x + w * y] = rgba[(int)line[x]];
 		}

backends/platform/sdl/win32/win32-main.cpp

@@ -56,8 +56,8 @@ int main(int argc, char *argv[]) {
 	PluginManager::instance().addPluginProvider(new SDLPluginProvider());
 #endif
 
-	// Invoke the actual Residual main entry point:
+	// Invoke the actual ResidualVM main entry point:
-	int res = residual_main(argc, argv);
+	int res = residualvm_main(argc, argv);
 
 	// Free OSystem
 	delete (OSystem_Win32 *)g_system;

backends/platform/sdl/win32/win32.cpp

@@ -69,7 +69,7 @@ void OSystem_Win32::initBackend() {
 			freopen("CONOUT$","w",stdout);
 			freopen("CONOUT$","w",stderr);
 		}
-		SetConsoleTitle("Residual Status Window");
+		SetConsoleTitle("ResidualVM Status Window");
 	} else {
 		FreeConsole();
 	}
@@ -173,7 +173,7 @@ Common::String OSystem_Win32::getDefaultConfigFileName() {
 		strcat(configFile, "\\Residual");
 		if (!CreateDirectory(configFile, NULL)) {
 			if (GetLastError() != ERROR_ALREADY_EXISTS)
-				error("Cannot create Residual application data folder");
+				error("Cannot create ResidualVM application data folder");
 		}
 
 		strcat(configFile, "\\" DEFAULT_CONFIG_FILE);
@@ -232,11 +232,11 @@ Common::WriteStream *OSystem_Win32::createLogFile() {
 			CreateDirectory(logFile, NULL);
 		}
 
-		strcat(logFile, "\\Residual");
+		strcat(logFile, "\\ResidualVM");
 		CreateDirectory(logFile, NULL);
 		strcat(logFile, "\\Logs");
 		CreateDirectory(logFile, NULL);
-		strcat(logFile, "\\residual.log");
+		strcat(logFile, "\\residualvm.log");
 
 		Common::FSNode file(logFile);
 		Common::WriteStream *stream = file.createWriteStream();

backends/saves/posix/posix-saves.cpp

@@ -51,7 +51,7 @@
 POSIXSaveFileManager::POSIXSaveFileManager() {
 	// Register default savepath based on HOME
 #if defined(SAMSUNGTV)
-	ConfMan.registerDefault("savepath", "/mtd_wiselink/residual savegames");
+	ConfMan.registerDefault("savepath", "/mtd_wiselink/residualvm savegames");
 #else
 	Common::String savePath;
 	const char *home = getenv("HOME");
@@ -69,13 +69,13 @@ POSIXSaveFileManager::POSIXSaveFileManager() {
 	// we only set the value in the transient domain if it is not
 	// yet present there.
 	if (!ConfMan.hasKey("savepath", Common::ConfigManager::kTransientDomain)) {
-		const char *dir = getenv("RESIDUAL_SAVEPATH");
+		const char *dir = getenv("RESIDUALVM_SAVEPATH");
 		if (dir && *dir && strlen(dir) < MAXPATHLEN) {
 			Common::FSNode saveDir(dir);
 			if (!saveDir.exists()) {
-				warning("Ignoring non-existent RESIDUAL_SAVEPATH '%s'", dir);
+				warning("Ignoring non-existent RESIDUALVM_SAVEPATH '%s'", dir);
 			} else if (!saveDir.isWritable()) {
-				warning("Ignoring non-writable RESIDUAL_SAVEPATH '%s'", dir);
+				warning("Ignoring non-writable RESIDUALVM_SAVEPATH '%s'", dir);
 			} else {
 				ConfMan.set("savepath", dir, Common::ConfigManager::kTransientDomain);
 			}

backends/taskbar/unity/unity-taskbar.cpp

@@ -40,7 +40,7 @@ UnityTaskbarManager::UnityTaskbarManager() {
 
 	_loop = g_main_loop_new(NULL, FALSE);
 
-	_launcher = unity_launcher_entry_get_for_desktop_id("scummvm.desktop");
+	_launcher = unity_launcher_entry_get_for_desktop_id("residualvm.desktop");
 }
 
 UnityTaskbarManager::~UnityTaskbarManager() {

base/commandLine.cpp

@@ -58,9 +58,9 @@ static const char USAGE_STRING[] =
 static const char HELP_STRING[] = "NoUsageString"; // save more data segment space
 #else
 static const char HELP_STRING[] =
-	"Residual - Virtual machine to run 3D adventure games\n"
+	"ResidualVM - Virtual machine to run 3D adventure games\n"
 	"Usage: %s [OPTIONS]... [GAME]\n"
-	"  -v, --version            Display Residual version information and exit\n"
+	"  -v, --version            Display ResidualVM version information and exit\n"
 	"  -h, --help               Display a brief help text and exit\n"
 	"  -z, --list-games         Display list of supported games and exit\n"
 	"  -t, --list-targets       Display list of configured targets and exit\n"
@@ -106,7 +106,7 @@ static const char HELP_STRING[] =
 ;
 #endif
 
-static const char *s_appName = "residual";
+static const char *s_appName = "residualvm";
 
 static void usage(const char *s, ...) GCC_PRINTF(1, 2);
 
@@ -821,8 +821,8 @@ bool processSettings(Common::String &command, Common::StringMap &settings, Commo
 		listThemes();
 		return true;
 	} else if (command == "version") {
-		printf("%s\n", gResidualFullVersion);
+		printf("%s\n", gResidualVMFullVersion);
-		printf("Features compiled in: %s\n", gResidualFeatures);
+		printf("Features compiled in: %s\n", gResidualVMFeatures);
 		return true;
 	} else if (command == "help") {
 		printf(HELP_STRING, s_appName);

base/internal_revision.h.in

@@ -1,6 +1,6 @@
-#ifndef RESIDUAL_INTERNAL_REVISION_H
+#ifndef RESIDUALVM_INTERNAL_REVISION_H
-#define RESIDUAL_INTERNAL_REVISION_H
+#define RESIDUALVM_INTERNAL_REVISION_H
 
-#define RESIDUAL_REVISION "@REVISION@"
+#define RESIDUALVM_REVISION "@REVISION@"
 
 #endif

base/internal_version.h

@@ -4,16 +4,16 @@
 
 // Reads revision number from file
 // (this is used when building with Visual Studio)
-#ifdef RESIDUAL_INTERNAL_REVISION
+#ifdef RESIDUALVM_INTERNAL_REVISION
 #include "internal_revision.h"
 #endif
 
 #ifdef RELEASE_BUILD
-#undef RESIDUAL_REVISION
+#undef RESIDUALVM_REVISION
 #endif
 
-#ifndef RESIDUAL_REVISION
+#ifndef RESIDUALVM_REVISION
-#define RESIDUAL_REVISION
+#define RESIDUALVM_REVISION
 #endif
 
-#define RESIDUAL_VERSION "0.0.7git" RESIDUAL_REVISION
+#define RESIDUALVM_VERSION "0.0.8git" RESIDUALVM_REVISION

base/internal_version.h.in

@@ -4,16 +4,16 @@
 
 // Reads revision number from file
 // (this is used when building with Visual Studio)
-#ifdef RESIDUAL_INTERNAL_REVISION
+#ifdef RESIDUALVM_INTERNAL_REVISION
 #include "internal_revision.h"
 #endif
 
 #ifdef RELEASE_BUILD
-#undef RESIDUAL_REVISION
+#undef RESIDUALVM_REVISION
 #endif
 
-#ifndef RESIDUAL_REVISION
+#ifndef RESIDUALVM_REVISION
-#define RESIDUAL_REVISION
+#define RESIDUALVM_REVISION
 #endif
 
-#define RESIDUAL_VERSION "@VERSION@" RESIDUAL_REVISION
+#define RESIDUALVM_VERSION "@VERSION@" RESIDUALVM_REVISION

base/main.cpp

@@ -20,9 +20,9 @@
  *
  */
 
-/*! \mainpage %Residual Source Reference
+/*! \mainpage %ResidualVM Source Reference
  *
- * These pages contains a cross referenced documentation for the %Residual source code,
+ * These pages contains a cross referenced documentation for the %ResidualVM source code,
  * generated with Doxygen (http://www.doxygen.org) directly from the source.
  * Currently not much is actually properly documented, but at least you can get an overview
  * of almost all the classes, methods and variables, and how they interact.
@@ -232,7 +232,7 @@ static void setupGraphics(OSystem &system) {
 	GUI::GuiManager::instance();
 
 	// Set initial window caption
-	system.setWindowCaption(gResidualFullVersion);
+	system.setWindowCaption(gResidualVMFullVersion);
 
 	// Clear the main screen
 	//system.fillScreen(0);
@@ -279,7 +279,7 @@ static void setupKeymapper(OSystem &system) {
 
 }
 
-extern "C" int residual_main(int argc, const char * const argv[]) {
+extern "C" int residualvm_main(int argc, const char * const argv[]) {
 	Common::String specialDebug;
 	Common::String command;
 
@@ -303,7 +303,7 @@ extern "C" int residual_main(int argc, const char * const argv[]) {
 	}
 
 	// Update the config file
-	ConfMan.set("versioninfo", gResidualVersion, Common::ConfigManager::kApplicationDomain);
+	ConfMan.set("versioninfo", gResidualVMVersion, Common::ConfigManager::kApplicationDomain);
 
 	// Load and setup the debuglevel and the debug flags. We do this at the
 	// soonest possible moment to ensure debug output starts early on, if

base/main.h

@@ -26,8 +26,8 @@
 #include "common/scummsys.h"
 
 //
-// The residual main entry point, to be invoked by ports
+// The residualvm main entry point, to be invoked by ports
 //
-extern "C" int residual_main(int argc, const char *const argv[]);
+extern "C" int residualvm_main(int argc, const char *const argv[]);
 
 #endif

base/plugins.h

@@ -92,7 +92,7 @@ extern int pluginTypeVersions[PLUGIN_TYPE_MAX];
 
 #ifdef USE_ELF_LOADER
 #define PLUGIN_DYNAMIC_BUILD_DATE \
-	PLUGIN_EXPORT const char *PLUGIN_getBuildDate() { return gScummVMPluginBuildDate; }
+	PLUGIN_EXPORT const char *PLUGIN_getBuildDate() { return gResidualVMPluginBuildDate; }
 #else
 #define PLUGIN_DYNAMIC_BUILD_DATE
 #endif

base/version.cpp

@@ -55,11 +55,11 @@
  * I don't know VC enough to be sure). And of course it must be robust enough
  * to properly work in exports (i.e. release tar balls etc.).
  */
-const char *gResidualVersion = RESIDUAL_VERSION;
+const char *gResidualVMVersion = RESIDUALVM_VERSION;
-const char *gResidualBuildDate = __DATE__ " " __TIME__;
+const char *gResidualVMBuildDate = __DATE__ " " __TIME__;
-const char *gResidualVersionDate = RESIDUAL_VERSION " (" __DATE__ " " __TIME__ ")";
+const char *gResidualVMVersionDate = RESIDUALVM_VERSION " (" __DATE__ " " __TIME__ ")";
-const char *gResidualFullVersion = "Residual " RESIDUAL_VERSION " (" __DATE__ " " __TIME__ ")";
+const char *gResidualVMFullVersion = "ResidualVM " RESIDUALVM_VERSION " (" __DATE__ " " __TIME__ ")";
-const char *gResidualFeatures = ""
+const char *gResidualVMFeatures = ""
 #ifdef TAINTED_BUILD
 	// TAINTED means the build contains engines/subengines not enabled by default
 	"TAINTED "

base/version.h

@@ -22,10 +22,10 @@
 #ifndef BASE_VERSION_H
 #define BASE_VERSION_H
 
-extern const char *gResidualVersion;		// e.g. "0.0.6"
+extern const char *gResidualVMVersion;		// e.g. "0.0.6"
-extern const char *gResidualBuildDate;		// e.g. "2008-06-15"
+extern const char *gResidualVMBuildDate;	// e.g. "2008-06-15"
-extern const char *gResidualVersionDate;	// e.g. "0.0.6 (2008-06-15)"
+extern const char *gResidualVMVersionDate;	// e.g. "0.0.6 (2008-06-15)"
-extern const char *gResidualFullVersion;	// e.g. "Residual 0.0.6 (2008-06-15)"
+extern const char *gResidualVMFullVersion;	// e.g. "Residual 0.0.6 (2008-06-15)"
-extern const char *gResidualFeatures;		// e.g. "ALSA MPEG2 zLib"
+extern const char *gResidualVMFeatures;		// e.g. "ALSA MPEG2 zLib"
 
 #endif

common/translation.cpp

@@ -340,7 +340,7 @@ void TranslationManager::loadLanguageDat(int index) {
 	// Get number of translations
 	int nbTranslations = in.readUint16BE();
 	if (nbTranslations != (int)_langs.size()) {
-		warning("The 'translations.dat' file has changed since starting Residual. GUI translation will not be available");
+		warning("The 'translations.dat' file has changed since starting ResidualVM. GUI translation will not be available");
 		return;
 	}
 

configure

@@ -132,8 +132,8 @@ _ar="ar cru"
 _as="as"
 _windres=windres
 _stagingpath="staging"
-_win32path="C:/residual"
+_win32path="C:/residualvm"
-_aos4path="Games:Residual"
+_aos4path="Games:ResidualVM"
 _staticlibpath=/sw
 _sdlconfig=sdl-config
 _sdlpath="$PATH"
@@ -157,15 +157,15 @@ _arm_asm=no
 # Like GNU autoconf, we distinguish datadir and datarootdir
 # to make it possible to change e.g. the location of the
 # man pages independently of that of the engine data files,
-# which are placed inside $datadir/residual
+# which are placed inside $datadir/residualvm
 prefix=NONE
 exec_prefix=NONE
 bindir='${exec_prefix}/bin'
 libdir='${exec_prefix}/lib'
 datarootdir='${prefix}/share'
-datadir='${datarootdir}/residual'
+datadir='${datarootdir}/residualvm'
 mandir='${datarootdir}/man'
-docdir='${datarootdir}/doc/residual'
+docdir='${datarootdir}/doc/residualvm'
 #localedir='${datarootdir}/locale'
 
 # For cross compiling
@@ -179,7 +179,7 @@ _srcdir=`dirname $0`
 _port_mk="ports.mk"
 
 # Use temp files in the build directory
-TMPO=./residual-conf
+TMPO=./residualvm-conf
 TMPC=${TMPO}.cpp
 TMPLOG=config.log
 
@@ -662,9 +662,9 @@ Fine tuning of the installation directories:
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
   --datadir=DIR           read-only architecture-independent data
-                          [DATAROOTDIR/residual]
+                          [DATAROOTDIR/residualvm]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/scummvm]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/residualvm]
 
 Special configuration feature:
   --host=HOST             cross-compile to target HOST (arm-linux, ...)
@@ -1050,7 +1050,7 @@ webos)
 	# The prefix is always the same on WebOS so we hardcode the default
 	# here. It is still possible to define a custom prefix which is
 	# needed when packaging the app with a user-specific app ID.
-	test "x$prefix" = xNONE && prefix=/media/cryptofs/apps/usr/palm/applications/org.scummvm.scummvm
+	test "x$prefix" = xNONE && prefix=/media/cryptofs/apps/usr/palm/applications/org.residualvm.residualvm
 	# WebOS apps are installed into app-specific directories. The 
 	# default directory structure of ScummVM makes no sense here so we
 	# hardcode WebOS specific directories here.
@@ -1779,7 +1779,7 @@ case $_host_os in
 		DEFINES="$DEFINES -D__USE_MINGW_ANSI_STDIO=0"
 		LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++"
 		LIBS="$LIBS -lmingw32 -lwinmm -lgdi32"
-		OBJS="$OBJS residualwinres.o"
+		OBJS="$OBJS residualvmwinres.o"
 		add_line_to_config_mk 'WIN32 = 1'
 		;;
 	mint*)
@@ -2093,7 +2093,7 @@ if test -n "$_host"; then
 			LDFLAGS="$LDFLAGS -mno-crt0"
 			LDFLAGS="$LDFLAGS -L$N64SDK/hkz-libn64"
 			LDFLAGS="$LDFLAGS -L$N64SDK/lib"
-			LDFLAGS="$LDFLAGS -T n64ld_cpp.x -Xlinker -Map -Xlinker scummvm.map"
+			LDFLAGS="$LDFLAGS -T n64ld_cpp.x -Xlinker -Map -Xlinker residualvm.map"
 			_backend="n64"
 			_mt32emu=no
 			_build_scalers=no
@@ -2455,8 +2455,8 @@ if test "$_dynamic_modules" = yes ; then
 # (otherwise unnecessary) dependency from plugins back
 # to the main libscummvm.so.
 _mak_plugins='
-PLUGIN_EXTRA_DEPS = libscummvm.so
+PLUGIN_EXTRA_DEPS = libresidualvm.so
-PLUGIN_LDFLAGS  += $(LDFLAGS) -L. -lscummvm
+PLUGIN_LDFLAGS  += $(LDFLAGS) -L. -lresidualvm
 PRE_OBJS_FLAGS  := -Wl,-export-dynamic -Wl,-whole-archive
 POST_OBJS_FLAGS := -Wl,-no-whole-archive
 '
@@ -2536,9 +2536,9 @@ POST_OBJS_FLAGS := -Wl,-no-whole-archive
 		_plugin_suffix=".dll"
 _mak_plugins='
 PLUGIN_EXTRA_DEPS	= $(EXECUTABLE)
-PLUGIN_LDFLAGS		:= -Wl,--enable-auto-import -shared ./libscummvm.a
+PLUGIN_LDFLAGS		:= -Wl,--enable-auto-import -shared ./libresidualvm.a
 PRE_OBJS_FLAGS		:= -Wl,--whole-archive
-POST_OBJS_FLAGS		:= -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libscummvm.a
+POST_OBJS_FLAGS		:= -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libresidualvm.a
 '
 		;;
 	wince)
@@ -2548,9 +2548,9 @@ POST_OBJS_FLAGS		:= -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-im
 		_plugin_suffix=".plugin"
 _mak_plugins='
 PLUGIN_EXTRA_DEPS	= $(EXECUTABLE)
-PLUGIN_LDFLAGS		:= -shared -lscummvm -L.
+PLUGIN_LDFLAGS		:= -shared -lresidualvm -L.
 PRE_OBJS_FLAGS		:= -Wl,--whole-archive
-POST_OBJS_FLAGS		:= -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libscummvm.a -shared
+POST_OBJS_FLAGS		:= -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libresidualvm.a -shared
 '
 		;;
 	ps2)
@@ -2951,7 +2951,7 @@ if test "$_libunity" = auto ; then
 			cat > $TMPC << EOF
 #include <unity.h>
 int main(void) {
-	unity_launcher_entry_get_for_desktop_id("scummvm.desktop");
+	unity_launcher_entry_get_for_desktop_id("residualvm.desktop");
 	return 0;
 }
 EOF
@@ -3200,7 +3200,7 @@ case $_backend in
 		DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"$libdir\\\""
 		;;
 	*)
-		DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"$libdir/residual\\\""
+		DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"$libdir/residualvm\\\""
 		;;
 esac
 
@@ -3415,7 +3415,7 @@ $_def_64bit_type_unsigned
 #else
 $_def_64bit_type_unsigned
 #endif
-typedef $type_ptr residualptr;
+typedef $type_ptr residualvmptr;
 
 /* Plugin settings */
 $_def_plugin

devtools/create_project/config.h

@@ -23,10 +23,10 @@
 #ifndef TOOLS_CREATE_PROJECT_CONFIG_H
 #define TOOLS_CREATE_PROJECT_CONFIG_H
 
-#define PROJECT_DESCRIPTION "Residual"    // Used in console output and build configuration
+#define PROJECT_DESCRIPTION "ResidualVM"  // Used in console output and build configuration
-#define PROJECT_NAME "residual"           // Used for folders, icons, resources and project/solution name
+#define PROJECT_NAME "residualvm"         // Used for folders, icons, resources and project/solution name
-#define LIBS_DEFINE "RESIDUAL_LIBS"       // Name of the include environment variable
+#define LIBS_DEFINE "RESIDUALVM_LIBS"     // Name of the include environment variable
-#define REVISION_DEFINE "RESIDUAL_INTERNAL_REVISION"
+#define REVISION_DEFINE "RESIDUALVM_INTERNAL_REVISION"
 
 #define HAS_VIDEO_FOLDER 1
 #define ADDITIONAL_LIBRARY "glu32"

devtools/create_project/msvc.cpp

@@ -165,7 +165,7 @@ std::string MSVCProvider::getPostBuildEvent(bool isWin32, bool createInstaller)
 
 	cmdLine += (isWin32) ? "x86" : "x64";
 
-	cmdLine += " %RESIDUAL_LIBS% ";
+	cmdLine += " %RESIDUALVM_LIBS% ";
 
 	// Specify if installer needs to be built or not
 	cmdLine += (createInstaller ? "1" : "0");

devtools/create_project/scripts/installer.vbs

@@ -74,7 +74,7 @@ Sub CreateInstaller()
 	                                " /Dtop_srcdir=""" & rootFolder & """" & _
 	                                " /Dstaging_dir=""" & targetFolder & """" & _
 	                                " /DARCH=""" & arch & """" & _
-	                                " """ & rootFolder & "\dists\win32\residual.nsi"""
+	                                " """ & rootFolder & "\dists\win32\residualvm.nsi"""
 
 	Dim oExec: Set oExec = WshShell.Exec(commandline)
 	If Err.Number <> 0 Then

devtools/create_project/xcode.cpp

@@ -86,34 +86,34 @@ XCodeProvider::XCodeProvider(StringList &global_warnings, std::map<std::string,
 
 void XCodeProvider::createWorkspace(const BuildSetup &setup) {
 	// Create project folder
-	std::string workspace = setup.outputDir + '/' + "scummvm.xcodeproj";
+	std::string workspace = setup.outputDir + '/' + "residualvm.xcodeproj";
 
 #if defined(_WIN32) || defined(WIN32)
 	if (!CreateDirectory(workspace.c_str(), NULL))
 		if (GetLastError() != ERROR_ALREADY_EXISTS)
-			error("Could not create folder \"" + setup.outputDir + '/' + "scummvm.xcodeproj\"");
+			error("Could not create folder \"" + setup.outputDir + '/' + "residualvm.xcodeproj\"");
 #else
 	if (mkdir(workspace.c_str(), 0777) == -1) {
 		if (errno == EEXIST) {
 			// Try to open as a folder (might be a file / symbolic link)
 			DIR *dirp = opendir(workspace.c_str());
 			if (dirp == NULL) {
-				error("Could not create folder \"" + setup.outputDir + '/' + "scummvm.xcodeproj\"");
+				error("Could not create folder \"" + setup.outputDir + '/' + "residualvm.xcodeproj\"");
 			} else {
 				// The folder exists, just close the stream and return
 				closedir(dirp);
 			}
 		} else {
-			error("Could not create folder \"" + setup.outputDir + '/' + "scummvm.xcodeproj\"");
+			error("Could not create folder \"" + setup.outputDir + '/' + "residualvm.xcodeproj\"");
 		}
 	}
 #endif
 
 	// Setup global objects
 	setupDefines(setup);
-	_targets.push_back("ScummVM-iPhone");
+	_targets.push_back("ResidualVM-iPhone");
-	_targets.push_back("ScummVM-OS X");
+	_targets.push_back("ResidualVM-OS X");
-	_targets.push_back("ScummVM-Simulator");
+	_targets.push_back("ResidualVM-Simulator");
 
 	setupCopyFilesBuildPhase();
 	setupFrameworksBuildPhase();
@@ -153,9 +153,9 @@ void XCodeProvider::createProjectFile(const std::string &, const std::string &,
 // Main Project file
 //////////////////////////////////////////////////////////////////////////
 void XCodeProvider::ouputMainProjectFile(const BuildSetup &setup) {
-	std::ofstream project((setup.outputDir + '/' + "scummvm.xcodeproj" + '/' + "project.pbxproj").c_str());
+	std::ofstream project((setup.outputDir + '/' + "residualvm.xcodeproj" + '/' + "project.pbxproj").c_str());
 	if (!project)
-		error("Could not open \"" + setup.outputDir + '/' + "scummvm.xcodeproj" + '/' + "project.pbxproj\" for writing");
+		error("Could not open \"" + setup.outputDir + '/' + "residualvm.xcodeproj" + '/' + "project.pbxproj\" for writing");
 
 	//////////////////////////////////////////////////////////////////////////
 	// Header
@@ -392,8 +392,8 @@ void XCodeProvider::setupNativeTarget() {
 		target->addProperty("dependencies", "", "", SettingsNoValue|SettingsAsList);
 
 		target->addProperty("name", _targets[i], "", SettingsNoValue|SettingsQuoteVariable);
-		target->addProperty("productName", "scummvm", "", SettingsNoValue);
+		target->addProperty("productName", "residual", "", SettingsNoValue);
-		target->addProperty("productReference", getHash("PBXFileReference_ScummVM.app_" + _targets[i]), "ScummVM.app", SettingsNoValue);
+		target->addProperty("productReference", getHash("PBXFileReference_ResidualVM.app_" + _targets[i]), "ResidualVM.app", SettingsNoValue);
 		target->addProperty("productType", "com.apple.product-type.application", "", SettingsNoValue|SettingsQuoteVariable);
 
 		_nativeTarget.add(target);
@@ -405,7 +405,7 @@ void XCodeProvider::setupProject() {
 
 	Object *project = new Object(this, "PBXProject", "PBXProject", "PBXProject", "", "Project object");
 
-	project->addProperty("buildConfigurationList", getHash("XCConfigurationList_scummvm"), "Build configuration list for PBXProject \"scummvm\"", SettingsNoValue);
+	project->addProperty("buildConfigurationList", getHash("XCConfigurationList_residualvm"), "Build configuration list for PBXProject \"residualvm\"", SettingsNoValue);
 	project->addProperty("compatibilityVersion", "Xcode 3.2", "", SettingsNoValue|SettingsQuoteVariable);
 	project->addProperty("developmentRegion", "English", "", SettingsNoValue);
 	project->addProperty("hasScannedForEncodings", "1", "", SettingsNoValue);
@@ -439,18 +439,7 @@ void XCodeProvider::setupResourcesBuildPhase() {
 
 	// Setup resource file properties
 	std::map<std::string, FileProperty> properties;
-	properties["scummclassic.zip"] = FileProperty("archive.zip", "", "scummclassic.zip", "\"<group>\"");
+	properties["modern.zip"]       = FileProperty("archive.zip", "", "modern.zip", "\"<group>\"");
-	properties["scummmodern.zip"]  = FileProperty("archive.zip", "", "scummmodern.zip", "\"<group>\"");
-
-	properties["kyra.dat"]         = FileProperty("file", "", "kyra.dat", "\"<group>\"");
-	properties["lure.dat"]         = FileProperty("file", "", "lure.dat", "\"<group>\"");
-	properties["queen.tbl"]        = FileProperty("file", "", "queen.tbl", "\"<group>\"");
-	properties["sky.cpt"]          = FileProperty("file", "", "sky.cpt", "\"<group>\"");
-	properties["drascula.dat"]     = FileProperty("file", "", "drascula.dat", "\"<group>\"");
-	properties["hugo.dat"]         = FileProperty("file", "", "hugo.dat", "\"<group>\"");
-	properties["m4.dat"]           = FileProperty("file", "", "m4.dat", "\"<group>\"");
-	properties["teenagent.dat"]    = FileProperty("file", "", "teenagent.dat", "\"<group>\"");
-	properties["toon.dat"]         = FileProperty("file", "", "toon.dat", "\"<group>\"");
 
 	properties["Default.png"]      = FileProperty("image.png", "", "Default.png", "\"<group>\"");
 	properties["icon.png"]         = FileProperty("image.png", "", "icon.png", "\"<group>\"");
@@ -469,8 +458,7 @@ void XCodeProvider::setupResourcesBuildPhase() {
 		files.flags = SettingsAsList;
 
 		ValueList files_list;
-		files_list.push_back("scummclassic.zip");
+		files_list.push_back("modern.zip");
-		files_list.push_back("scummmodern.zip");
 		files_list.push_back("kyra.dat");
 		files_list.push_back("lure.dat");
 		files_list.push_back("queen.tbl");
@@ -497,8 +485,8 @@ void XCodeProvider::setupResourcesBuildPhase() {
 		}
 
 		// Add custom files depending on the target
-		if (_targets[i] == "ScummVM-OS X") {
+		if (_targets[i] == "ResidualVM-OS X") {
-			files.settings[getHash("PBXResources_scummvm.icns")] = Setting("", "scummvm.icns in Resources", SettingsNoValue, 0, 6);
+			files.settings[getHash("PBXResources_residualvm.icns")] = Setting("", "residualvm.icns in Resources", SettingsNoValue, 0, 6);
 
 			// Remove 2 iphone icon files
 			files.settings.erase(getHash("PBXResources_Default.png"));
@@ -528,7 +516,7 @@ void XCodeProvider::setupBuildConfiguration() {
 	// ****************************************/
 
 	// Debug
-	Object *iPhone_Debug_Object = new Object(this, "XCBuildConfiguration_ScummVM-iPhone_Debug", _targets[0] /* ScummVM-iPhone */, "XCBuildConfiguration", "PBXNativeTarget", "Debug");
+	Object *iPhone_Debug_Object = new Object(this, "XCBuildConfiguration_ResidualVM-iPhone_Debug", _targets[0] /* ScummVM-iPhone */, "XCBuildConfiguration", "PBXNativeTarget", "Debug");
 	Property iPhone_Debug;
 	ADD_SETTING_QUOTE(iPhone_Debug, "ARCHS", "$(ARCHS_UNIVERSAL_IPHONE_OS)");
 	ADD_SETTING_QUOTE(iPhone_Debug, "CODE_SIGN_IDENTITY", "iPhone Developer");
@@ -560,7 +548,7 @@ void XCodeProvider::setupBuildConfiguration() {
 	ADD_SETTING_LIST(iPhone_Debug, "LIBRARY_SEARCH_PATHS", iPhone_LibPaths, SettingsAsList, 5);
 	ADD_SETTING(iPhone_Debug, "ONLY_ACTIVE_ARCH", "YES");
 	ADD_SETTING(iPhone_Debug, "PREBINDING", "NO");
-	ADD_SETTING(iPhone_Debug, "PRODUCT_NAME", "ScummVM");
+	ADD_SETTING(iPhone_Debug, "PRODUCT_NAME", "ResidualVM");
 	ADD_SETTING_QUOTE(iPhone_Debug, "PROVISIONING_PROFILE", "EF590570-5FAC-4346-9071-D609DE2B28D8");
 	ADD_SETTING_QUOTE_VAR(iPhone_Debug, "PROVISIONING_PROFILE[sdk=iphoneos*]", "");
 	ADD_SETTING(iPhone_Debug, "SDKROOT", "iphoneos4.0");
@@ -570,7 +558,7 @@ void XCodeProvider::setupBuildConfiguration() {
 	iPhone_Debug_Object->properties["buildSettings"] = iPhone_Debug;
 
 	// Release
-	Object *iPhone_Release_Object = new Object(this, "XCBuildConfiguration_ScummVM-iPhone_Release", _targets[0] /* ScummVM-iPhone */, "XCBuildConfiguration", "PBXNativeTarget", "Release");
+	Object *iPhone_Release_Object = new Object(this, "XCBuildConfiguration_ResidualVM-iPhone_Release", _targets[0] /* ScummVM-iPhone */, "XCBuildConfiguration", "PBXNativeTarget", "Release");
 	Property iPhone_Release(iPhone_Debug);
 	ADD_SETTING(iPhone_Release, "GCC_OPTIMIZATION_LEVEL", "3");
 	ADD_SETTING(iPhone_Release, "COPY_PHASE_STRIP", "YES");
@@ -588,153 +576,153 @@ void XCodeProvider::setupBuildConfiguration() {
 	 ****************************************/
 
 	// Debug
-	Object *scummvm_Debug_Object = new Object(this, "XCBuildConfiguration_scummvm_Debug", "scummvm", "XCBuildConfiguration", "PBXProject", "Debug");
+	Object *residualvm_Debug_Object = new Object(this, "XCBuildConfiguration_residualvm_Debug", "residualvm", "XCBuildConfiguration", "PBXProject", "Debug");
-	Property scummvm_Debug;
+	Property residualvm_Debug;
-	ADD_SETTING(scummvm_Debug, "ALWAYS_SEARCH_USER_PATHS", "NO");
+	ADD_SETTING(residualvm_Debug, "ALWAYS_SEARCH_USER_PATHS", "NO");
-	ADD_SETTING_QUOTE(scummvm_Debug, "ARCHS", "$(ARCHS_STANDARD_32_BIT)");
+	ADD_SETTING_QUOTE(residualvm_Debug, "ARCHS", "$(ARCHS_STANDARD_32_BIT)");
-	ADD_SETTING_QUOTE(scummvm_Debug, "CODE_SIGN_IDENTITY", "Don't Code Sign");
+	ADD_SETTING_QUOTE(residualvm_Debug, "CODE_SIGN_IDENTITY", "Don't Code Sign");
-	ADD_SETTING_QUOTE_VAR(scummvm_Debug, "CODE_SIGN_IDENTITY[sdk=iphoneos*]", "Don't Code Sign");
+	ADD_SETTING_QUOTE_VAR(residualvm_Debug, "CODE_SIGN_IDENTITY[sdk=iphoneos*]", "Don't Code Sign");
-	ADD_SETTING_QUOTE(scummvm_Debug, "FRAMEWORK_SEARCH_PATHS", "");
+	ADD_SETTING_QUOTE(residualvm_Debug, "FRAMEWORK_SEARCH_PATHS", "");
-	ADD_SETTING(scummvm_Debug, "GCC_C_LANGUAGE_STANDARD", "c99");
+	ADD_SETTING(residualvm_Debug, "GCC_C_LANGUAGE_STANDARD", "c99");
-	ADD_SETTING(scummvm_Debug, "GCC_ENABLE_CPP_EXCEPTIONS", "NO");
+	ADD_SETTING(residualvm_Debug, "GCC_ENABLE_CPP_EXCEPTIONS", "NO");
-	ADD_SETTING(scummvm_Debug, "GCC_ENABLE_CPP_RTTI", "NO");
+	ADD_SETTING(residualvm_Debug, "GCC_ENABLE_CPP_RTTI", "NO");
-	ADD_SETTING(scummvm_Debug, "GCC_INPUT_FILETYPE", "automatic");
+	ADD_SETTING(residualvm_Debug, "GCC_INPUT_FILETYPE", "automatic");
-	ADD_SETTING(scummvm_Debug, "GCC_OPTIMIZATION_LEVEL", "0");
+	ADD_SETTING(residualvm_Debug, "GCC_OPTIMIZATION_LEVEL", "0");
-	ValueList scummvm_defines(_defines);
+	ValueList residualvm_defines(_defines);
-	ADD_DEFINE(scummvm_defines, "IPHONE");
+	ADD_DEFINE(residualvm_defines, "IPHONE");
-	ADD_DEFINE(scummvm_defines, "XCODE");
+	ADD_DEFINE(residualvm_defines, "XCODE");
-	ADD_DEFINE(scummvm_defines, "IPHONE_OFFICIAL");
+	ADD_DEFINE(residualvm_defines, "IPHONE_OFFICIAL");
-	ADD_SETTING_LIST(scummvm_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, SettingsNoQuote|SettingsAsList, 5);
+	ADD_SETTING_LIST(residualvm_Debug, "GCC_PREPROCESSOR_DEFINITIONS", residualvm_defines, SettingsNoQuote|SettingsAsList, 5);
-	ADD_SETTING(scummvm_Debug, "GCC_THUMB_SUPPORT", "NO");
+	ADD_SETTING(residualvm_Debug, "GCC_THUMB_SUPPORT", "NO");
-	ADD_SETTING(scummvm_Debug, "GCC_USE_GCC3_PFE_SUPPORT", "NO");
+	ADD_SETTING(residualvm_Debug, "GCC_USE_GCC3_PFE_SUPPORT", "NO");
-	ADD_SETTING(scummvm_Debug, "GCC_WARN_ABOUT_RETURN_TYPE", "YES");
+	ADD_SETTING(residualvm_Debug, "GCC_WARN_ABOUT_RETURN_TYPE", "YES");
-	ADD_SETTING(scummvm_Debug, "GCC_WARN_UNUSED_VARIABLE", "YES");
+	ADD_SETTING(residualvm_Debug, "GCC_WARN_UNUSED_VARIABLE", "YES");
-	ValueList scummvm_HeaderPaths;
+	ValueList residualvm_HeaderPaths;
-	scummvm_HeaderPaths.push_back("include/");
+	residualvm_HeaderPaths.push_back("include/");
-	scummvm_HeaderPaths.push_back("../../engines/");
+	residualvm_HeaderPaths.push_back("../../engines/");
-	scummvm_HeaderPaths.push_back("../../");
+	residualvm_HeaderPaths.push_back("../../");
-	ADD_SETTING_LIST(scummvm_Debug, "HEADER_SEARCH_PATHS", scummvm_HeaderPaths, SettingsNoQuote|SettingsAsList, 5);
+	ADD_SETTING_LIST(residualvm_Debug, "HEADER_SEARCH_PATHS", residualvm_HeaderPaths, SettingsNoQuote|SettingsAsList, 5);
-	ADD_SETTING_QUOTE(scummvm_Debug, "LIBRARY_SEARCH_PATHS", "");
+	ADD_SETTING_QUOTE(residualvm_Debug, "LIBRARY_SEARCH_PATHS", "");
-	ADD_SETTING(scummvm_Debug, "ONLY_ACTIVE_ARCH", "YES");
+	ADD_SETTING(residualvm_Debug, "ONLY_ACTIVE_ARCH", "YES");
-	ADD_SETTING_QUOTE(scummvm_Debug, "OTHER_CFLAGS", "");
+	ADD_SETTING_QUOTE(residualvm_Debug, "OTHER_CFLAGS", "");
-	ADD_SETTING_QUOTE(scummvm_Debug, "OTHER_LDFLAGS", "-lz");
+	ADD_SETTING_QUOTE(residualvm_Debug, "OTHER_LDFLAGS", "-lz");
-	ADD_SETTING(scummvm_Debug, "PREBINDING", "NO");
+	ADD_SETTING(residualvm_Debug, "PREBINDING", "NO");
-	ADD_SETTING(scummvm_Debug, "SDKROOT", "macosx10.6");
+	ADD_SETTING(residualvm_Debug, "SDKROOT", "macosx10.6");
 
-	scummvm_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
+	residualvm_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
-	scummvm_Debug_Object->properties["buildSettings"] = scummvm_Debug;
+	residualvm_Debug_Object->properties["buildSettings"] = residualvm_Debug;
 
 	// Release
-	Object *scummvm_Release_Object = new Object(this, "XCBuildConfiguration_scummvm_Release", "scummvm", "XCBuildConfiguration", "PBXProject", "Release");
+	Object *residualvm_Release_Object = new Object(this, "XCBuildConfiguration_residualvm_Release", "residualvm", "XCBuildConfiguration", "PBXProject", "Release");
-	Property scummvm_Release(scummvm_Debug);
+	Property residualvm_Release(residualvm_Debug);
-	REMOVE_SETTING(scummvm_Release, "GCC_C_LANGUAGE_STANDARD");       // Not sure why we remove that, or any of the other warnings
+	REMOVE_SETTING(residualvm_Release, "GCC_C_LANGUAGE_STANDARD");       // Not sure why we remove that, or any of the other warnings
-	REMOVE_SETTING(scummvm_Release, "GCC_WARN_ABOUT_RETURN_TYPE");
+	REMOVE_SETTING(residualvm_Release, "GCC_WARN_ABOUT_RETURN_TYPE");
-	REMOVE_SETTING(scummvm_Release, "GCC_WARN_UNUSED_VARIABLE");
+	REMOVE_SETTING(residualvm_Release, "GCC_WARN_UNUSED_VARIABLE");
-	REMOVE_SETTING(scummvm_Release, "ONLY_ACTIVE_ARCH");
+	REMOVE_SETTING(residualvm_Release, "ONLY_ACTIVE_ARCH");
 
-	scummvm_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
+	residualvm_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
-	scummvm_Release_Object->properties["buildSettings"] = scummvm_Release;
+	residualvm_Release_Object->properties["buildSettings"] = residualvm_Release;
 
-	_buildConfiguration.add(scummvm_Debug_Object);
+	_buildConfiguration.add(residualvm_Debug_Object);
-	_buildConfiguration.add(scummvm_Release_Object);
+	_buildConfiguration.add(residualvm_Release_Object);
 
 	/****************************************
 	 * ScummVM-OS X
 	 ****************************************/
 
 	// Debug
-	Object *scummvmOSX_Debug_Object = new Object(this, "XCBuildConfiguration_ScummVM-OSX_Debug", _targets[1] /* ScummVM-OS X */, "XCBuildConfiguration", "PBXNativeTarget", "Debug");
+	Object *residualvmOSX_Debug_Object = new Object(this, "XCBuildConfiguration_ResidualVM-OSX_Debug", _targets[1] /* ScummVM-OS X */, "XCBuildConfiguration", "PBXNativeTarget", "Debug");
-	Property scummvmOSX_Debug;
+	Property residualvmOSX_Debug;
-	ADD_SETTING_QUOTE(scummvmOSX_Debug, "ARCHS", "$(NATIVE_ARCH)");
+	ADD_SETTING_QUOTE(residualvmOSX_Debug, "ARCHS", "$(NATIVE_ARCH)");
-	ADD_SETTING(scummvmOSX_Debug, "COMPRESS_PNG_FILES", "NO");
+	ADD_SETTING(residualvmOSX_Debug, "COMPRESS_PNG_FILES", "NO");
-	ADD_SETTING(scummvmOSX_Debug, "COPY_PHASE_STRIP", "NO");
+	ADD_SETTING(residualvmOSX_Debug, "COPY_PHASE_STRIP", "NO");
-	ADD_SETTING_QUOTE(scummvmOSX_Debug, "DEBUG_INFORMATION_FORMAT", "dwarf-with-dsym");
+	ADD_SETTING_QUOTE(residualvmOSX_Debug, "DEBUG_INFORMATION_FORMAT", "dwarf-with-dsym");
-	ADD_SETTING_QUOTE(scummvmOSX_Debug, "FRAMEWORK_SEARCH_PATHS", "");
+	ADD_SETTING_QUOTE(residualvmOSX_Debug, "FRAMEWORK_SEARCH_PATHS", "");
-	ADD_SETTING(scummvmOSX_Debug, "GCC_C_LANGUAGE_STANDARD", "c99");
+	ADD_SETTING(residualvmOSX_Debug, "GCC_C_LANGUAGE_STANDARD", "c99");
-	ADD_SETTING(scummvmOSX_Debug, "GCC_ENABLE_CPP_EXCEPTIONS", "NO");
+	ADD_SETTING(residualvmOSX_Debug, "GCC_ENABLE_CPP_EXCEPTIONS", "NO");
-	ADD_SETTING(scummvmOSX_Debug, "GCC_ENABLE_CPP_RTTI", "NO");
+	ADD_SETTING(residualvmOSX_Debug, "GCC_ENABLE_CPP_RTTI", "NO");
-	ADD_SETTING(scummvmOSX_Debug, "GCC_DYNAMIC_NO_PIC", "NO");
+	ADD_SETTING(residualvmOSX_Debug, "GCC_DYNAMIC_NO_PIC", "NO");
-	ADD_SETTING(scummvmOSX_Debug, "GCC_ENABLE_FIX_AND_CONTINUE", "NO");
+	ADD_SETTING(residualvmOSX_Debug, "GCC_ENABLE_FIX_AND_CONTINUE", "NO");
-	ADD_SETTING(scummvmOSX_Debug, "GCC_OPTIMIZATION_LEVEL", "0");
+	ADD_SETTING(residualvmOSX_Debug, "GCC_OPTIMIZATION_LEVEL", "0");
-	ADD_SETTING(scummvmOSX_Debug, "GCC_PRECOMPILE_PREFIX_HEADER", "NO");
+	ADD_SETTING(residualvmOSX_Debug, "GCC_PRECOMPILE_PREFIX_HEADER", "NO");
-	ADD_SETTING_QUOTE(scummvmOSX_Debug, "GCC_PREFIX_HEADER", "");
+	ADD_SETTING_QUOTE(residualvmOSX_Debug, "GCC_PREFIX_HEADER", "");
-	ValueList scummvmOSX_defines(_defines);
+	ValueList residualvmOSX_defines(_defines);
-	ADD_DEFINE(scummvmOSX_defines, "SDL_BACKEND");
+	ADD_DEFINE(residualvmOSX_defines, "SDL_BACKEND");
-	ADD_DEFINE(scummvmOSX_defines, "MACOSX");
+	ADD_DEFINE(residualvmOSX_defines, "MACOSX");
-	ADD_SETTING_LIST(scummvmOSX_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvmOSX_defines, SettingsNoQuote|SettingsAsList, 5);
+	ADD_SETTING_LIST(residualvmOSX_Debug, "GCC_PREPROCESSOR_DEFINITIONS", residualvmOSX_defines, SettingsNoQuote|SettingsAsList, 5);
-	ADD_SETTING_QUOTE(scummvmOSX_Debug, "GCC_VERSION", "");
+	ADD_SETTING_QUOTE(residualvmOSX_Debug, "GCC_VERSION", "");
-	ValueList scummvmOSX_HeaderPaths;
+	ValueList residualvmOSX_HeaderPaths;
-	scummvmOSX_HeaderPaths.push_back("/opt/local/include/SDL");
+	residualvmOSX_HeaderPaths.push_back("/opt/local/include/SDL");
-	scummvmOSX_HeaderPaths.push_back("/opt/local/include");
+	residualvmOSX_HeaderPaths.push_back("/opt/local/include");
-	scummvmOSX_HeaderPaths.push_back("include/");
+	residualvmOSX_HeaderPaths.push_back("include/");
-	scummvmOSX_HeaderPaths.push_back("../../engines/");
+	residualvmOSX_HeaderPaths.push_back("../../engines/");
-	scummvmOSX_HeaderPaths.push_back("../../");
+	residualvmOSX_HeaderPaths.push_back("../../");
-	ADD_SETTING_LIST(scummvmOSX_Debug, "HEADER_SEARCH_PATHS", scummvmOSX_HeaderPaths, SettingsNoQuote|SettingsAsList, 5);
+	ADD_SETTING_LIST(residualvmOSX_Debug, "HEADER_SEARCH_PATHS", residualvmOSX_HeaderPaths, SettingsNoQuote|SettingsAsList, 5);
-	ADD_SETTING_QUOTE(scummvmOSX_Debug, "INFOPLIST_FILE", "$(SRCROOT)/../macosx/Info.plist");
+	ADD_SETTING_QUOTE(residualvmOSX_Debug, "INFOPLIST_FILE", "$(SRCROOT)/../macosx/Info.plist");
-	ValueList scummvmOSX_LibPaths;
+	ValueList residualvmOSX_LibPaths;
-	scummvmOSX_LibPaths.push_back("/sw/lib");
+	residualvmOSX_LibPaths.push_back("/sw/lib");
-	scummvmOSX_LibPaths.push_back("/opt/local/lib");
+	residualvmOSX_LibPaths.push_back("/opt/local/lib");
-	scummvmOSX_LibPaths.push_back("\"$(inherited)\"");
+	residualvmOSX_LibPaths.push_back("\"$(inherited)\"");
-	scummvmOSX_LibPaths.push_back("\"\\\\\\\"$(SRCROOT)/lib\\\\\\\"\"");  // mmmh, all those slashes, it's almost Christmas \o/
+	residualvmOSX_LibPaths.push_back("\"\\\\\\\"$(SRCROOT)/lib\\\\\\\"\"");  // mmmh, all those slashes, it's almost Christmas \o/
-	ADD_SETTING_LIST(scummvmOSX_Debug, "LIBRARY_SEARCH_PATHS", scummvmOSX_LibPaths, SettingsNoQuote|SettingsAsList, 5);
+	ADD_SETTING_LIST(residualvmOSX_Debug, "LIBRARY_SEARCH_PATHS", residualvmOSX_LibPaths, SettingsNoQuote|SettingsAsList, 5);
-	ADD_SETTING_QUOTE(scummvmOSX_Debug, "OTHER_CFLAGS", "");
+	ADD_SETTING_QUOTE(residualvmOSX_Debug, "OTHER_CFLAGS", "");
-	ValueList scummvmOSX_LdFlags;
+	ValueList residualvmOSX_LdFlags;
-	scummvmOSX_LdFlags.push_back("-lSDLmain");
+	residualvmOSX_LdFlags.push_back("-lSDLmain");
-	scummvmOSX_LdFlags.push_back("-logg");
+	residualvmOSX_LdFlags.push_back("-logg");
-	scummvmOSX_LdFlags.push_back("-lvorbisfile");
+	residualvmOSX_LdFlags.push_back("-lvorbisfile");
-	scummvmOSX_LdFlags.push_back("-lvorbis");
+	residualvmOSX_LdFlags.push_back("-lvorbis");
-	scummvmOSX_LdFlags.push_back("-lmad");
+	residualvmOSX_LdFlags.push_back("-lmad");
-	scummvmOSX_LdFlags.push_back("-lFLAC");
+	residualvmOSX_LdFlags.push_back("-lFLAC");
-	scummvmOSX_LdFlags.push_back("-lSDL");
+	residualvmOSX_LdFlags.push_back("-lSDL");
-	scummvmOSX_LdFlags.push_back("-lz");
+	residualvmOSX_LdFlags.push_back("-lz");
-	ADD_SETTING_LIST(scummvmOSX_Debug, "OTHER_LDFLAGS", scummvmOSX_LdFlags, SettingsAsList, 5);
+	ADD_SETTING_LIST(residualvmOSX_Debug, "OTHER_LDFLAGS", residualvmOSX_LdFlags, SettingsAsList, 5);
-	ADD_SETTING(scummvmOSX_Debug, "PREBINDING", "NO");
+	ADD_SETTING(residualvmOSX_Debug, "PREBINDING", "NO");
-	ADD_SETTING(scummvmOSX_Debug, "PRODUCT_NAME", "ScummVM");
+	ADD_SETTING(residualvmOSX_Debug, "PRODUCT_NAME", "ResidualVM");
 
-	scummvmOSX_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
+	residualvmOSX_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
-	scummvmOSX_Debug_Object->properties["buildSettings"] = scummvmOSX_Debug;
+	residualvmOSX_Debug_Object->properties["buildSettings"] = residualvmOSX_Debug;
 
 	// Release
-	Object *scummvmOSX_Release_Object = new Object(this, "XCBuildConfiguration_ScummVMOSX_Release", _targets[1] /* ScummVM-OS X */, "XCBuildConfiguration", "PBXNativeTarget", "Release");
+	Object *residualvmOSX_Release_Object = new Object(this, "XCBuildConfiguration_ResidualVMOSX_Release", _targets[1] /* ScummVM-OS X */, "XCBuildConfiguration", "PBXNativeTarget", "Release");
-	Property scummvmOSX_Release(scummvmOSX_Debug);
+	Property residualvmOSX_Release(residualvmOSX_Debug);
-	ADD_SETTING(scummvmOSX_Release, "COPY_PHASE_STRIP", "YES");
+	ADD_SETTING(residualvmOSX_Release, "COPY_PHASE_STRIP", "YES");
-	REMOVE_SETTING(scummvmOSX_Release, "GCC_DYNAMIC_NO_PIC");
+	REMOVE_SETTING(residualvmOSX_Release, "GCC_DYNAMIC_NO_PIC");
-	REMOVE_SETTING(scummvmOSX_Release, "GCC_OPTIMIZATION_LEVEL");
+	REMOVE_SETTING(residualvmOSX_Release, "GCC_OPTIMIZATION_LEVEL");
-	ADD_SETTING(scummvmOSX_Release, "WRAPPER_EXTENSION", "app");
+	ADD_SETTING(residualvmOSX_Release, "WRAPPER_EXTENSION", "app");
 
-	scummvmOSX_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
+	residualvmOSX_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
-	scummvmOSX_Release_Object->properties["buildSettings"] = scummvmOSX_Release;
+	residualvmOSX_Release_Object->properties["buildSettings"] = residualvmOSX_Release;
 
-	_buildConfiguration.add(scummvmOSX_Debug_Object);
+	_buildConfiguration.add(residualvmOSX_Debug_Object);
-	_buildConfiguration.add(scummvmOSX_Release_Object);
+	_buildConfiguration.add(residualvmOSX_Release_Object);
 
 	/****************************************
 	 * ScummVM-Simulator
 	 ****************************************/
 
 	// Debug
-	Object *scummvmSimulator_Debug_Object = new Object(this, "XCBuildConfiguration_ScummVM-Simulator_Debug", _targets[2] /* ScummVM-Simulator */, "XCBuildConfiguration", "PBXNativeTarget", "Debug");
+	Object *residualvmSimulator_Debug_Object = new Object(this, "XCBuildConfiguration_ResidualVM-Simulator_Debug", _targets[2] /* ScummVM-Simulator */, "XCBuildConfiguration", "PBXNativeTarget", "Debug");
-	Property scummvmSimulator_Debug(iPhone_Debug);
+	Property residualvmSimulator_Debug(iPhone_Debug);
-	ADD_SETTING_QUOTE(scummvmSimulator_Debug, "FRAMEWORK_SEARCH_PATHS", "$(inherited)");
+	ADD_SETTING_QUOTE(residualvmSimulator_Debug, "FRAMEWORK_SEARCH_PATHS", "$(inherited)");
-	ADD_SETTING_LIST(scummvmSimulator_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, SettingsNoQuote|SettingsAsList, 5);
+	ADD_SETTING_LIST(residualvmSimulator_Debug, "GCC_PREPROCESSOR_DEFINITIONS", residualvm_defines, SettingsNoQuote|SettingsAsList, 5);
-	ADD_SETTING(scummvmSimulator_Debug, "SDKROOT", "iphonesimulator3.2");
+	ADD_SETTING(residualvmSimulator_Debug, "SDKROOT", "iphonesimulator3.2");
-	REMOVE_SETTING(scummvmSimulator_Debug, "TARGETED_DEVICE_FAMILY");
+	REMOVE_SETTING(residualvmSimulator_Debug, "TARGETED_DEVICE_FAMILY");
 
-	scummvmSimulator_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
+	residualvmSimulator_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
-	scummvmSimulator_Debug_Object->properties["buildSettings"] = scummvmSimulator_Debug;
+	residualvmSimulator_Debug_Object->properties["buildSettings"] = residualvmSimulator_Debug;
 
 	// Release
-	Object *scummvmSimulator_Release_Object = new Object(this, "XCBuildConfiguration_ScummVM-Simulator_Release", _targets[2] /* ScummVM-Simulator */, "XCBuildConfiguration", "PBXNativeTarget", "Release");
+	Object *residualvmSimulator_Release_Object = new Object(this, "XCBuildConfiguration_ResidualVM-Simulator_Release", _targets[2] /* ScummVM-Simulator */, "XCBuildConfiguration", "PBXNativeTarget", "Release");
-	Property scummvmSimulator_Release(scummvmSimulator_Debug);
+	Property residualvmSimulator_Release(residualvmSimulator_Debug);
-	ADD_SETTING(scummvmSimulator_Release, "COPY_PHASE_STRIP", "YES");
+	ADD_SETTING(residualvmSimulator_Release, "COPY_PHASE_STRIP", "YES");
-	REMOVE_SETTING(scummvmSimulator_Release, "GCC_DYNAMIC_NO_PIC");
+	REMOVE_SETTING(residualvmSimulator_Release, "GCC_DYNAMIC_NO_PIC");
-	ADD_SETTING(scummvmSimulator_Release, "WRAPPER_EXTENSION", "app");
+	ADD_SETTING(residualvmSimulator_Release, "WRAPPER_EXTENSION", "app");
 
-	scummvmSimulator_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
+	residualvmSimulator_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
-	scummvmSimulator_Release_Object->properties["buildSettings"] = scummvmSimulator_Release;
+	residualvmSimulator_Release_Object->properties["buildSettings"] = residualvmSimulator_Release;
 
-	_buildConfiguration.add(scummvmSimulator_Debug_Object);
+	_buildConfiguration.add(residualvmSimulator_Debug_Object);
-	_buildConfiguration.add(scummvmSimulator_Release_Object);
+	_buildConfiguration.add(residualvmSimulator_Release_Object);
 
 	//////////////////////////////////////////////////////////////////////////
 	// Configuration List
@@ -779,7 +767,7 @@ void XCodeProvider::setupDefines(const BuildSetup &setup) {
 	ADD_DEFINE(_defines, "SCUMM_NEED_ALIGNMENT");
 	ADD_DEFINE(_defines, "SCUMM_LITTLE_ENDIAN");
 	ADD_DEFINE(_defines, "UNIX");
-	ADD_DEFINE(_defines, "SCUMMVM");
+	ADD_DEFINE(_defines, "RESIDUALVM");
 	ADD_DEFINE(_defines, "USE_TREMOR");
 }
 

devtools/credits.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # This tools is kind of a hack to be able to maintain the credits list of
-# Residual in a single central location. We then generate the various versions
+# ResidualVM in a single central location. We then generate the various versions
 # of the credits in other places from this source. In particular:
 # - The AUTHORS file
 # - The gui/credits.h header file
@@ -444,7 +444,7 @@ sub add_paragraph {
 #
 
 begin_credits("Credits");
-    begin_section("Residual Team");
+    begin_section("ResidualVM Team");
 	begin_section("Project Leader");
 	    begin_persons();
 		add_person("Paweł Kołodziejski", "aquadran", "");
@@ -498,7 +498,7 @@ begin_credits("Credits");
 
     begin_section("ScummVM code");
 	  add_paragraph(
-	  "Residual use a lot of ScummVM code. ".
+	  "ResidualVM use a lot of ScummVM code. ".
 	  "For a list of authors look into COPYRIGHT file. ");
     end_section();
 

devtools/update-version.pl

@@ -32,7 +32,7 @@ print "Setting version to '$VERSION'\n";
 # List of the files in which we need to perform substitution.
 my @subs_files = qw(
 	base/internal_version.h
-	dists/residual.rc
+	dists/residualvm.rc
 	dists/macosx/Info.plist
 	);
 

dists/debian/control

@@ -1,15 +1,15 @@
-Source: residual
+Source: residualvm
 Section: games
 Priority: optional
-Maintainer: Pawel Kolodziejski <aquadran@scummvm.org>
+Maintainer: Pawel Kolodziejski <aquadran@users.sourceforge.net>
 Build-Depends: debhelper (>= 5.0.0), libgl1-mesa-dev, libsdl1.2-dev, libz-dev, libmad0-dev, libvorbis-dev (>= 1.0.0-2), libflac-dev (>= 1.1.1-2), libz-dev, libfluidsynth-dev
 Standards-Version: 3.8.0
 
-Package: residual
+Package: residualvm
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: A 3D game interpreter which allow to play LucasArts' LUA-based
  3D adventures such as Grim Fandango.
  .
- Residual utilizes OpenGL for 3D graphics hardware acceleration.
+ ResidualVM utilizes OpenGL for 3D graphics hardware acceleration.
  A software renderer is also included for machines without hardware OpenGL.

dists/debian/copyright

@@ -1,6 +1,6 @@
-Residual was debianized by Pino Toscano <pino@kde.org> the 4th Oct 2008.
+ResidualVM was debianized by Pino Toscano <pino@kde.org> the 4th Oct 2008.
 
-Upstream Authors: see `/usr/share/doc/residual/AUTHORS'.
+Upstream Authors: see `/usr/share/doc/residualvm/AUTHORS'.
 
 Copyright:
 
@@ -9,7 +9,7 @@ Some other source files are released under GNU Lesser General Public
 License v2.
 The Debian packaging is licensed under the GPL.
 
-Residual includes Lua licensed code:
+ResidualVM includes Lua licensed code:
 /******************************************************************************
 * Copyright (c) 1994-1998 TeCGraf, PUC-Rio.  All rights reserved.
 * 
@@ -45,7 +45,7 @@ Residual includes Lua licensed code:
 ******************************************************************************/
 
 
-Residual include also TinyGL code:
+ResidualVM include also TinyGL code:
 /******************************************************************************/
 Copyright notice:
 

dists/debian/prepare

@@ -4,7 +4,7 @@
 # calls "make deb".  It adds a changelog entry to the top of debian/changelog
 # so that the version number is correct.
 
-VERSION=`cat base/internal_version.h | grep RESIDUAL_VERSION | cut -d\" -f2`-`date +%Y%m%d`
+VERSION=`cat base/internal_version.h | grep RESIDUALVM_VERSION | cut -d\" -f2`-`date +%Y%m%d`
 USERNAME=`whoami`
 GECOS=`getent passwd $USERNAME | awk '-F[,:]' '{print $5}'`
 DOMAIN=`hostname --fqdn`
@@ -17,17 +17,17 @@ TMP=`tempfile`
 cat debian/changelog > $TMP
 
 cat << __eof > debian/changelog
-residual ($VERSION) experimental; urgency=low
+residualvm ($VERSION) experimental; urgency=low
 
   * GIT snapshot.
 
     Build-date: $DATE
 
     Please don't file bugs you find in this package in the Debian Bug Tracking
-    system, use the Residual team's own bug tracker instead.  You can find this
+    system, use the ResidualVM team's own bug tracker instead.  You can find this
-    tracker at <https://www.github.com/residual/residual/issues>.
+    tracker at <https://www.github.com/residualvm/residualvm/issues>.
 
- -- Pawel Kolodziejski <aquadran@scummvm.org>  $DATE
+ -- Pawel Kolodziejski <aquadran@users.sourceforge.net>  $DATE
 
 __eof
 

dists/debian/residual.menu

@@ -1,3 +0,0 @@
-?package(residual):needs="x11" section="Games/Adventure" \
-  title="Residual" command="/usr/games/residual" \
-  icon="/usr/share/pixmaps/residual.xpm"

dists/debian/residualvm.menu

@@ -0,0 +1,3 @@
+?package(residualvm):needs="x11" section="Games/Adventure" \
+  title="ResidualVM" command="/usr/games/residualvm" \
+  icon="/usr/share/pixmaps/residualvm.xpm"

dists/debian/rules

@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 
-build: residual
+build: residualvm
 
-residual:
+residualvm:
 	dh_testdir
-	./configure --enable-release --prefix=/usr --bindir=/usr/games --datadir=/usr/share/residual --mandir=/usr/share/man
+	./configure --enable-release --prefix=/usr --bindir=/usr/games --datadir=/usr/share/residualvm --mandir=/usr/share/man
 	$(MAKE)
 
 clean:
@@ -18,9 +18,9 @@ install: build
 	dh_testroot
 	dh_clean
 	dh_installdirs
-	$(MAKE) install DESTDIR=debian/residual
+	$(MAKE) install DESTDIR=debian/residualvm
-	install -m 644 dists/residual.desktop debian/residual/usr/share/applications
+	install -m 644 dists/residualvm.desktop debian/residualvm/usr/share/applications
-	#install -m 644 icons/residual.svg debian/residual/usr/share/pixmaps
+	#install -m 644 icons/residualvm.svg debian/residualvm/usr/share/pixmaps
 
 binary: binary-arch
 

dists/macosx/Info.plist

@@ -5,19 +5,19 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleDisplayName</key>
-	<string>Residual</string>
+	<string>ResidualVM</string>
 	<key>CFBundleExecutable</key>
-	<string>residual</string>
+	<string>residualvm</string>
 	<key>CFBundleGetInfoString</key>
 	<string>0.0.7git</string>
 	<key>CFBundleIconFile</key>
-	<string>residual.icns</string>
+	<string>residualvm.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.residual</string>
+	<string>org.residualvm</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Residual</string>
+	<string>ResidualVM</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

dists/macosx/Info.plist.in

@@ -5,19 +5,19 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleDisplayName</key>
-	<string>Residual</string>
+	<string>ResidualVM</string>
 	<key>CFBundleExecutable</key>
-	<string>residual</string>
+	<string>residualvm</string>
 	<key>CFBundleGetInfoString</key>
 	<string>@VERSION@</string>
 	<key>CFBundleIconFile</key>
-	<string>residual.icns</string>
+	<string>residualvm.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.residual</string>
+	<string>org.residualvm</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Residual</string>
+	<string>ResidualVM</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

dists/msvc10/create_msvc10.bat

@@ -76,7 +76,7 @@ echo Removing all project files
 del /Q *.vcxproj* > NUL 2>&1
 del /Q *.props > NUL 2>&1
 del /Q *.sln* > NUL 2>&1
-del /Q scummvm* > NUL 2>&1
+del /Q residual* > NUL 2>&1
 goto done
 
 :done

dists/msvc8/create_msvc8.bat

@@ -76,7 +76,7 @@ echo Removing all project files
 del /Q *.vcproj* > NUL 2>&1
 del /Q *.vsprops > NUL 2>&1
 del /Q *.sln* > NUL 2>&1
-del /Q scummvm* > NUL 2>&1
+del /Q residual* > NUL 2>&1
 goto done
 
 :done

dists/msvc9/create_msvc9.bat

@@ -76,7 +76,7 @@ echo Removing all project files
 del /Q *.vcproj* > NUL 2>&1
 del /Q *.vsprops > NUL 2>&1
 del /Q *.sln* > NUL 2>&1
-del /Q scummvm* > NUL 2>&1
+del /Q residualvm* > NUL 2>&1
 goto done
 
 :done

dists/residualvm.6

@@ -1,12 +1,12 @@
 .\"	$Id$
 .Dd May 28, 2011
-.Dt RESIDUAL 6
+.Dt RESIDUALVM 6
 .Os
 .Sh NAME
-.Nm residual
+.Nm residualvm
 .Nd interpreter for several 3D games
 .Sh SYNOPSIS
-.Nm residual
+.Nm residualvm
 .Op Ar options
 .Op Ar game
 .Sh DESCRIPTION
@@ -44,7 +44,7 @@ range 0-127 (default: 127).
 .It Fl t
 Display list of configured targets and exit.
 .It Fl v
-Display Residual version information and exit.
+Display ResidualVM version information and exit.
 .It Fl x Ar slot
 Save game
 .Ar slot
@@ -68,18 +68,18 @@ Quit (Most platforms)
 .El
 .Sh FILES
 .Bl -tag -width Ds
-.It Pa $HOME/.residualrc
+.It Pa $HOME/.residualvmrc
 Configuration file on UNIX.
-.It Pa "$HOME/Library/Preferences/Residual Preferences"
+.It Pa "$HOME/Library/Preferences/ResidualVM Preferences"
 Configuration file on Mac OS X.
 .El
 .Sh EXAMPLES
 Running the builtin game launcher:
 .Pp
-.Dl $ residual
+.Dl $ residualvm
 .Pp
 .Sh SEE ALSO
 More information can be found in the README and on the website
-.Pa http://residual.sourceforge.net .
+.Pa http://residualvm.org .
 .Sh AUTHORS
 See AUTHORS file for more information.

dists/residualvm.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Residual
+Name=ResidualVM
 Comment=Interpreter for several 3D games
-Exec=residual
+Exec=residualvm
-Icon=residual
+Icon=residualvm
 Terminal=false
 Type=Application
 Categories=Game;AdventureGame;

dists/residualvm.iss

@@ -1,17 +1,17 @@
-; -- residual.iss --
+; -- residualvm.iss --
-; Inno Setup 5 Script for Residual.
+; Inno Setup 5 Script for ResidualVM.
 
 [Setup]
-AppName=Residual
+AppName=ResidualVM
-AppVerName=Residual GIT Snapshot
+AppVerName=ResidualVM GIT Snapshot
 AllowNoIcons=true
 Compression=lzma
-DefaultDirName={pf}\Residual
+DefaultDirName={pf}\ResidualVM
-DefaultGroupName=Residual
+DefaultGroupName=ResidualVM
 SolidCompression=yes
-OutputDir=userdocs:Residual_ISS5_Output
+OutputDir=userdocs:ResidualVM_ISS5_Output
-OutputBaseFilename=residual-win32
+OutputBaseFilename=residualvm-win32
-UninstallDisplayIcon={app}\residual.exe
+UninstallDisplayIcon={app}\residualvm.exe
 
 [Files]
 Source: "AUTHORS.txt"; DestDir: "{app}"; Flags: ignoreversion
@@ -21,13 +21,13 @@ Source: "COPYRIGHT.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "NEWS.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "README.txt"; DestDir: "{app}"; Flags: ignoreversion isreadme
 Source: "README-SDL.txt"; DestDir: "{app}"; Flags: ignoreversion
-Source: "residual.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "residualvm.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "modern.zip"; DestDir: "{app}"; Flags: ignoreversion
 Source: "SDL.dll"; DestDir: "{app}"
 
 [Icons]
-Name: {group}\{cm:UninstallProgram, Residual}; Filename: {uninstallexe}
+Name: {group}\{cm:UninstallProgram, ResidualVM}; Filename: {uninstallexe}
-Name: {group}\residual; Filename: {app}\residual.exe; WorkingDir: {app}; Comment: residual; Flags: createonlyiffileexists
+Name: {group}\residualvm; Filename: {app}\residualvm.exe; WorkingDir: {app}; Comment: residualvm; Flags: createonlyiffileexists
 Name: {group}\Authors; Filename: {app}\AUTHORS.txt; WorkingDir: {app}; Comment: AUTHORS; Flags: createonlyiffileexists
 Name: {group}\Copying; Filename: {app}\COPYING.txt; WorkingDir: {app}; Comment: COPYING; Flags: createonlyiffileexists
 Name: {group}\Copying.LGPL; Filename: {app}\COPYING.LGPL.txt; WorkingDir: {app}; Comment: COPYING.LGPL; Flags: createonlyiffileexists
@@ -36,4 +36,4 @@ Name: {group}\Readme; Filename: {app}\README.txt; WorkingDir: {app}; Comment: RE
 Name: {group}\News; Filename: {app}\NEWS.txt; WorkingDir: {app}; Comment: NEWS; Flags: createonlyiffileexists
 
 [Run]
-Filename: {app}\residual.exe; Description: Launch Residual; Flags: nowait skipifdoesntexist postinstall skipifsilent
+Filename: {app}\residualvm.exe; Description: Launch ResidualVM; Flags: nowait skipifdoesntexist postinstall skipifsilent

dists/residualvm.rc

@@ -6,7 +6,7 @@
 
 #define FILE 256
 
-IDI_ICON               ICON    DISCARDABLE     "icons/residual.ico"
+IDI_ICON               ICON    DISCARDABLE     "icons/residualvm.ico"
 
 modern.zip        FILE    "gui/themes/modern.zip"
 #ifdef USE_TRANSLATION
@@ -31,13 +31,13 @@ BEGIN
         BLOCK "040904b0" // US English, Unicode
         BEGIN
             VALUE "Comments", "\0"
-            VALUE "FileDescription", "http://residual.sourceforge.net/\0"
+            VALUE "FileDescription", "http://www.residualvm.org/\0"
-            VALUE "FileVersion", "0.0.7git\0"
+            VALUE "FileVersion", "0.0.8git\0"
-            VALUE "InternalName", "residual\0"
+            VALUE "InternalName", "residualvm\0"
             VALUE "LegalCopyright", "Copyrights information are in AUTHORS file\0"
-            VALUE "OriginalFilename", "residual.exe\0"
+            VALUE "OriginalFilename", "residualvm.exe\0"
-            VALUE "ProductName", "Residual\0"
+            VALUE "ProductName", "ResidualVM\0"
-            VALUE "ProductVersion", "0.0.7git\0"
+            VALUE "ProductVersion", "0.0.8git\0"
         END
     END
 

dists/residualvm.rc.in

@@ -6,7 +6,7 @@
 
 #define FILE 256
 
-IDI_ICON               ICON    DISCARDABLE     "icons/residual.ico"
+IDI_ICON               ICON    DISCARDABLE     "icons/residualvm.ico"
 
 modern.zip        FILE    "gui/themes/modern.zip"
 #ifdef USE_TRANSLATION
@@ -33,12 +33,12 @@ BEGIN
         BLOCK "040904b0" // US English, Unicode
         BEGIN
             VALUE "Comments", "\0"
-            VALUE "FileDescription", "http://residual.sourceforge.net/\0"
+            VALUE "FileDescription", "http://www.residualvm.org/\0"
             VALUE "FileVersion", "@VERSION@\0"
-            VALUE "InternalName", "residual\0"
+            VALUE "InternalName", "residualvm\0"
             VALUE "LegalCopyright", "Copyrights information are in AUTHORS file\0"
-            VALUE "OriginalFilename", "residual.exe\0"
+            VALUE "OriginalFilename", "residualvm.exe\0"
-            VALUE "ProductName", "Residual\0"
+            VALUE "ProductName", "ResidualVM\0"
             VALUE "ProductVersion", "@VERSION@\0"
         END
     END

engines/advancedDetector.cpp

@@ -294,7 +294,7 @@ static void reportUnknown(const Common::FSNode &path, const SizeMD5Map &filesSiz
 	// Might also be helpful to display the full path (for when this is used
 	// from the mass detector).
 	Common::String report = Common::String::format(_("The game in '%s' seems to be unknown."), path.getPath().c_str()) + "\n";
-	report += _("Please, report the following data to the Residual team along with name");
+	report += _("Please, report the following data to the ResidualVM team along with name");
 	report += "\n";
 	report += _("of the game you tried to add and its version/language/etc.:");
 	report += "\n";

engines/dialogs.cpp

@@ -70,15 +70,15 @@ MainMenuDialog::MainMenuDialog(Engine *engine)
 		_logo->useThemeTransparency(true);
 		_logo->setGfx(g_gui.theme()->getImageSurface(GUI::ThemeEngine::kImageLogoSmall));
 	} else {
-		GUI::StaticTextWidget *title = new GUI::StaticTextWidget(this, "GlobalMenu.Title", "Residual");
+		GUI::StaticTextWidget *title = new GUI::StaticTextWidget(this, "GlobalMenu.Title", "ResidualVM");
 		title->setAlign(Graphics::kTextAlignCenter);
 	}
 #else
-	GUI::StaticTextWidget *title = new GUI::StaticTextWidget(this, "GlobalMenu.Title", "Residual");
+	GUI::StaticTextWidget *title = new GUI::StaticTextWidget(this, "GlobalMenu.Title", "ResidualVM");
 	title->setAlign(Graphics::kTextAlignCenter);
 #endif
 
-	GUI::StaticTextWidget *version = new GUI::StaticTextWidget(this, "GlobalMenu.Version", gResidualVersionDate);
+	GUI::StaticTextWidget *version = new GUI::StaticTextWidget(this, "GlobalMenu.Version", gResidualVMVersionDate);
 	version->setAlign(Graphics::kTextAlignCenter);
 
 	new GUI::ButtonWidget(this, "GlobalMenu.Resume", _("~R~esume"), 0, kPlayCmd, 'P');
@@ -199,7 +199,7 @@ void MainMenuDialog::reflowLayout() {
 	} else {
 		GUI::StaticTextWidget *title = (GUI::StaticTextWidget *)findWidget("GlobalMenu.Title");
 		if (!title) {
-			title = new GUI::StaticTextWidget(this, "GlobalMenu.Title", "Residual");
+			title = new GUI::StaticTextWidget(this, "GlobalMenu.Title", "ResidualVM");
 			title->setAlign(Graphics::kTextAlignCenter);
 		}
 

engines/engine.cpp

@@ -272,9 +272,9 @@ void Engine::openMainMenuDialog() {
 bool Engine::warnUserAboutUnsupportedGame() {
 	if (ConfMan.getBool("enable_unsupported_game_warning")) {
 		GUI::MessageDialog alert(_("WARNING: The game you are about to start is"
-			" not yet fully supported by Residual. As such, it is likely to be"
+			" not yet fully supported by ResidualVM. As such, it is likely to be"
 			" unstable, and any saves you make might not work in future"
-			" versions of Residual."), _("Start anyway"), _("Cancel"));
+			" versions of ResidualVM."), _("Start anyway"), _("Cancel"));
 		return alert.runModal() == GUI::kMessageOK;
 	}
 	return true;

engines/grim/gfx_opengl.cpp

@@ -102,7 +102,7 @@ byte *GfxOpenGL::setupScreen(int screenW, int screenH, bool fullscreen) {
 	g_system->showMouse(!fullscreen);
 
 	char GLDriver[1024];
-	sprintf(GLDriver, "Residual: %s/%s", glGetString(GL_VENDOR), glGetString(GL_RENDERER));
+	sprintf(GLDriver, "ResidualVM: %s/%s", glGetString(GL_VENDOR), glGetString(GL_RENDERER));
 	g_system->setWindowCaption(GLDriver);
 
 	// Load emergency built-in font

engines/grim/gfx_tinygl.cpp

@@ -168,7 +168,7 @@ byte *GfxTinyGL::setupScreen(int screenW, int screenH, bool fullscreen) {
 
 	g_system->showMouse(!fullscreen);
 
-	g_system->setWindowCaption("Residual: Software 3D Renderer");
+	g_system->setWindowCaption("ResidualVM: Software 3D Renderer");
 
 	_zb = TinyGL::ZB_open(screenW, screenH, ZB_MODE_5R6G5B, buffer);
 	TinyGL::glInit(_zb);

engines/grim/lua/README.residualvm

@@ -1,4 +1,4 @@
-This is a modified version of Lua 3.1 intended for use with Residual.
+This is a modified version of Lua 3.1 intended for use with ResidualVM.
 The major changes made from the original version of Lua 3.1 are:
 
 * Applied differences from RCS labeled 3.1-alpha from lua.org.

engines/grim/resource.cpp

@@ -86,7 +86,7 @@ ResourceLoader::ResourceLoader() {
 			//In this case put it in the top of the list
 			Common::ArchiveMemberList::iterator datausr_it = Common::find_if(files.begin(), files.end(), LabListComperator("datausr.lab"));
 			if (datausr_it != files.end()) {
-				Grim::InputDialog d("User-patch detected, the Residual-team\n provides no support for using such patches.\n Click OK to load, or Cancel\n to skip the patch.", "OK", false);
+				Grim::InputDialog d("User-patch detected, the ResidualVM-team\n provides no support for using such patches.\n Click OK to load, or Cancel\n to skip the patch.", "OK", false);
 				int res = d.runModal();
 				if (res == GUI::kMessageOK)
 					files.push_front(*datausr_it);

engines/grim/textsplit.cpp

@@ -29,7 +29,7 @@
 namespace Grim {
 
 // FIXME: Replace this with a proper parser (this is just too dodgy :)
-int residual_vsscanf(const char *str, int field_count, const char *format, va_list ap) {
+int residualvm_vsscanf(const char *str, int field_count, const char *format, va_list ap) {
 	unsigned int f01 = va_arg(ap, long);
 	unsigned int f02 = va_arg(ap, long);
 	unsigned int f03 = va_arg(ap, long);
@@ -52,7 +52,7 @@ int residual_vsscanf(const char *str, int field_count, const char *format, va_li
 	unsigned int f20 = va_arg(ap, long);
 
 	if (field_count > 20)
-		error("Too many fields requested of residual_vsscanf (%d)", field_count);
+		error("Too many fields requested of residualvm_vsscanf (%d)", field_count);
 
 	return sscanf(str, format, f01, f02, f03, f04, f05, f06, f07, f08, f09, f10,
 			f11, f12, f13, f14, f15, f16, f17, f18, f19, f20);
@@ -123,7 +123,7 @@ void TextSplitter::scanString(const char *fmt, int field_count, ...) {
 	va_start(va, field_count);
 
 #ifdef WIN32
-	if (residual_vsscanf(getCurrentLine(), field_count, fmt, va) < field_count)
+	if (residualvm_vsscanf(getCurrentLine(), field_count, fmt, va) < field_count)
 #else
 	if (vsscanf(getCurrentLine(), fmt, va) < field_count)
 #endif

gui/ThemeEngine.cpp

@@ -718,7 +718,7 @@ bool ThemeEngine::loadDefaultXML() {
 	if (!_parser->loadBuffer((const byte *)defaultXML, strlen(defaultXML)))
 		return false;
 
-	_themeName = "Residual Classic Theme (Builtin Version)";
+	_themeName = "ResidualVM Classic Theme (Builtin Version)";
 	_themeId = "builtin";
 	_themeFile.clear();
 
@@ -1272,7 +1272,7 @@ void ThemeEngine::openDialog(bool doBuffer, ShadingStyle style) {
 }
 
 bool ThemeEngine::createCursor(const Common::String &filename, int hotspotX, int hotspotY, int scale) {
-	return true; // Residual doesn's support cursor palette mode
+	return true; // ResidualVM doesn's support cursor palette mode
 
 	// Try to locate the specified file among all loaded bitmaps
 	const Graphics::Surface *cursor = _bitmaps[filename];
@@ -1493,7 +1493,7 @@ bool ThemeEngine::themeConfigParseHeader(Common::String header, Common::String &
 
 	Common::StringTokenizer tok(header, ":");
 
-	if (tok.nextToken() != RESIDUAL_THEME_VERSION_STR)
+	if (tok.nextToken() != RESIDUALVM_THEME_VERSION_STR)
 		return false;
 
 	themeName = tok.nextToken();
@@ -1572,7 +1572,7 @@ struct TDComparator {
 void ThemeEngine::listUsableThemes(Common::List<ThemeDescriptor> &list) {
 #ifndef DISABLE_GUI_BUILTIN_THEME
 	ThemeDescriptor th;
-	th.name = "Residual Classic Theme (Builtin Version)";
+	th.name = "ResidualVM Classic Theme (Builtin Version)";
 	th.id = "builtin";
 	th.filename.clear();
 	list.push_back(th);

gui/ThemeEngine.h

@@ -35,7 +35,7 @@
 #include "graphics/pixelformat.h"
 
 
-#define RESIDUAL_THEME_VERSION_STR "RESIDUAL_STX0.8.3"
+#define RESIDUALVM_THEME_VERSION_STR "RESIDUAL_STX0.8.3"
 
 class OSystem;
 

gui/about.cpp

@@ -54,10 +54,10 @@ enum {
 
 static const char *copyright_text[] = {
 "",
-"C0""Copyright (C) 2003-2012 The Residual project",
+"C0""Copyright (C) 2003-2012 The ResidualVM project",
 "C0""http://www.residualvm.org",
 "",
-"C0""Residual is the legal property of its developers, whose names are too numerous to list here. Please refer to the AUTHORS file distributed with this binary.",
+"C0""ResidualVM is the legal property of its developers, whose names are too numerous to list here. Please refer to the AUTHORS file distributed with this binary.",
 "",
 };
 
@@ -84,11 +84,11 @@ AboutDialog::AboutDialog()
 	for (i = 0; i < 1; i++)
 		_lines.push_back("");
 
-	Common::String version("C0""Residual ");
+	Common::String version("C0""ResidualVM ");
-	version += gResidualVersion;
+	version += gResidualVMVersion;
 	_lines.push_back(version);
 
-	Common::String date = Common::String::format(_("(built on %s)"), gResidualBuildDate);
+	Common::String date = Common::String::format(_("(built on %s)"), gResidualVMBuildDate);
 	_lines.push_back("C2" + date);
 
 	for (i = 0; i < ARRAYSIZE(copyright_text); i++)
@@ -98,7 +98,7 @@ AboutDialog::AboutDialog()
 	features += _("Features compiled in:");
 	addLine(features.c_str());
 	Common::String featureList("C0");
-	featureList += gResidualFeatures;
+	featureList += gResidualVMFeatures;
 	addLine(featureList.c_str());
 
 	_lines.push_back("");

gui/console.cpp

@@ -86,7 +86,7 @@ ConsoleDialog::ConsoleDialog(float widthPercent, float heightPercent)
 		_history[i][0] = '\0';
 
 	// Display greetings & prompt
-	print(gResidualFullVersion);
+	print(gResidualVMFullVersion);
 	print("\nConsole is ready\n");
 }
 

gui/credits.h

@@ -1,6 +1,6 @@
 // This file was generated by credits.pl. Do not edit by hand!
 static const char *credits[] = {
-"C1""Residual Team",
+"C1""ResidualVM Team",
 "",
 "C1""Project Leader",
 "C0""Pawel Kolodziejski",
@@ -80,7 +80,7 @@ static const char *credits[] = {
 "",
 "C1""ScummVM code",
 "",
-"C0""Residual use a lot of ScummVM code. For a list of authors look into COPYRIGHT file. ",
+"C0""ResidualVM use a lot of ScummVM code. For a list of authors look into COPYRIGHT file. ",
 "C0""",
 "",
 "C1""Website code",

gui/launcher.cpp

@@ -544,17 +544,17 @@ LauncherDialog::LauncherDialog()
 		_logo->useThemeTransparency(true);
 		_logo->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageLogo));
 
-		new StaticTextWidget(this, "Launcher.Version", gResidualVersionDate);
+		new StaticTextWidget(this, "Launcher.Version", gResidualVMVersionDate);
 	} else
-		new StaticTextWidget(this, "Launcher.Version", gResidualFullVersion);
+		new StaticTextWidget(this, "Launcher.Version", gResidualVMFullVersion);
 #else
 	// Show ScummVM version
-	new StaticTextWidget(this, "Launcher.Version", gResidualFullVersion);
+	new StaticTextWidget(this, "Launcher.Version", gResidualVMFullVersion);
 #endif
 
-	new ButtonWidget(this, "Launcher.QuitButton", _("~Q~uit"), _("Quit Residual"), kQuitCmd);
+	new ButtonWidget(this, "Launcher.QuitButton", _("~Q~uit"), _("Quit ResidualVM"), kQuitCmd);
-	new ButtonWidget(this, "Launcher.AboutButton", _("A~b~out..."), _("About Residual"), kAboutCmd);
+	new ButtonWidget(this, "Launcher.AboutButton", _("A~b~out..."), _("About ResidualVM"), kAboutCmd);
-	new ButtonWidget(this, "Launcher.OptionsButton", _("~O~ptions..."), _("Change global Residual options"), kOptionsCmd);
+	new ButtonWidget(this, "Launcher.OptionsButton", _("~O~ptions..."), _("Change global ResidualVM options"), kOptionsCmd);
 	_startButton =
 		new ButtonWidget(this, "Launcher.StartButton", _("~S~tart"), _("Start selected game"), kStartCmd);
 
@@ -769,7 +769,7 @@ void LauncherDialog::addGame() {
 			Common::FSNode dir(_browser->getResult());
 			Common::FSList files;
 			if (!dir.getChildren(files, Common::FSNode::kListAll)) {
-				MessageDialog alert(_("Residual couldn't open the specified directory!"));
+				MessageDialog alert(_("ResidualVM couldn't open the specified directory!"));
 				alert.runModal();
 				return;
 			}
@@ -781,7 +781,7 @@ void LauncherDialog::addGame() {
 			int idx;
 			if (candidates.empty()) {
 				// No game was found in the specified directory
-				MessageDialog alert(_("Residual could not find any game in the specified directory!"));
+				MessageDialog alert(_("ResidualVM could not find any game in the specified directory!"));
 				alert.runModal();
 				idx = -1;
 
@@ -937,7 +937,7 @@ void LauncherDialog::loadGame(int item) {
 			dialog.runModal();
 		}
 	} else {
-		MessageDialog dialog(_("Residual could not find any engine capable of running the selected game!"), _("OK"));
+		MessageDialog dialog(_("ResidualVM could not find any engine capable of running the selected game!"), _("OK"));
 		dialog.runModal();
 	}
 }
@@ -1064,7 +1064,7 @@ void LauncherDialog::reflowLayout() {
 		StaticTextWidget *ver = (StaticTextWidget*)findWidget("Launcher.Version");
 		if (ver) {
 			ver->setAlign((Graphics::TextAlign)g_gui.xmlEval()->getVar("Launcher.Version.Align", Graphics::kTextAlignCenter));
-			ver->setLabel(gResidualVersionDate);
+			ver->setLabel(gResidualVMVersionDate);
 		}
 
 		if (!_logo)
@@ -1075,7 +1075,7 @@ void LauncherDialog::reflowLayout() {
 		StaticTextWidget *ver = (StaticTextWidget*)findWidget("Launcher.Version");
 		if (ver) {
 			ver->setAlign((Graphics::TextAlign)g_gui.xmlEval()->getVar("Launcher.Version.Align", Graphics::kTextAlignCenter));
-			ver->setLabel(gResidualFullVersion);
+			ver->setLabel(gResidualVMFullVersion);
 		}
 
 		if (_logo) {

gui/options.cpp

@@ -833,10 +833,10 @@ GlobalOptionsDialog::GlobalOptionsDialog()
 	_themePath = new StaticTextWidget(tab, "GlobalOptions_Paths.ThemePath", _c("None", "path"));
 
 	if (g_system->getOverlayWidth() > 320)
-		new ButtonWidget(tab, "GlobalOptions_Paths.ExtraButton", _("Extra Path:"), _("Specifies path to additional data used by all games or Residual"), kChooseExtraDirCmd);
+		new ButtonWidget(tab, "GlobalOptions_Paths.ExtraButton", _("Extra Path:"), _("Specifies path to additional data used by all games or ResidualVM"), kChooseExtraDirCmd);
 	else
-		new ButtonWidget(tab, "GlobalOptions_Paths.ExtraButton", _c("Extra Path:", "lowres"), _("Specifies path to additional data used by all games or Residual"), kChooseExtraDirCmd);
+		new ButtonWidget(tab, "GlobalOptions_Paths.ExtraButton", _c("Extra Path:", "lowres"), _("Specifies path to additional data used by all games or ResidualVM"), kChooseExtraDirCmd);
-	_extraPath = new StaticTextWidget(tab, "GlobalOptions_Paths.ExtraPath", _c("None", "path"), _("Specifies path to additional data used by all games or Residual"));
+	_extraPath = new StaticTextWidget(tab, "GlobalOptions_Paths.ExtraPath", _c("None", "path"), _("Specifies path to additional data used by all games or ResidualVM"));
 
 #ifdef DYNAMIC_MODULES
 	if (g_system->getOverlayWidth() > 320)
@@ -888,7 +888,7 @@ GlobalOptionsDialog::GlobalOptionsDialog()
 
 
 #ifdef USE_TRANSLATION
-	_guiLanguagePopUpDesc = new StaticTextWidget(tab, "GlobalOptions_Misc.GuiLanguagePopupDesc", _("GUI Language:"), _("Language of Residual GUI"));
+	_guiLanguagePopUpDesc = new StaticTextWidget(tab, "GlobalOptions_Misc.GuiLanguagePopupDesc", _("GUI Language:"), _("Language of ResidualVM GUI"));
 	_guiLanguagePopUp = new PopUpWidget(tab, "GlobalOptions_Misc.GuiLanguagePopup");
 #ifdef USE_DETECTLANG
 	_guiLanguagePopUp->appendEntry(_("<default>"), Common::kTranslationAutodetectId);
@@ -1037,7 +1037,7 @@ void GlobalOptionsDialog::close() {
 			// only become active *after* the options dialog has closed.
 			g_gui.loadNewTheme(g_gui.theme()->getThemeId(), ThemeEngine::kGfxDisabled, true);
 #else
-			MessageDialog error(_("You have to restart Residual before your changes will take effect."));
+			MessageDialog error(_("You have to restart ResidualVM before your changes will take effect."));
 			error.runModal();
 #endif
 		}

gui/themes/modern/THEMERC

@@ -1 +1 @@
-[RESIDUAL_STX0.8.3:Residual Modern Theme:No Author]
+[RESIDUAL_STX0.8.3:ResidualVM Modern Theme:No Author]

icons/residualvm.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static const char *residual_icon[] = {
+static const char *residualvm_icon[] = {
 "32 32 83 1",
 " 	c None",
 ".	c #010200",

po/module.mk

@@ -1,14 +1,14 @@
-POTFILE := $(srcdir)/po/residual.pot
+POTFILE := $(srcdir)/po/residualvm.pot
 POFILES := $(wildcard $(srcdir)/po/*.po)
 
 updatepot:
-	xgettext -f $(srcdir)/po/POTFILES -D $(srcdir) -d residual --c++ -k_ -k_s -k_c:1,2c -k_sc:1,2c \
+	xgettext -f $(srcdir)/po/POTFILES -D $(srcdir) -d residualvm --c++ -k_ -k_s -k_c:1,2c -k_sc:1,2c \
 		-kDECLARE_TRANSLATION_ADDITIONAL_CONTEXT:1,2c -o $(POTFILE) \
-		--copyright-holder="Residual Team" --package-name=Residual \
+		--copyright-holder="ResidualVM Team" --package-name=ResidualVM \
-		--package-version=$(VERSION) --msgid-bugs-address=residual-devel@lists.sf.net -o $(POTFILE)_
+		--package-version=$(VERSION) --msgid-bugs-address=residualvm-devel@lists.sf.net -o $(POTFILE)_
 
-	sed -e 's/SOME DESCRIPTIVE TITLE/LANGUAGE translation for Residual/' \
+	sed -e 's/SOME DESCRIPTIVE TITLE/LANGUAGE translation for ResidualVM/' \
-		-e 's/UTF-8/CHARSET/' -e 's/PACKAGE/Residual/' $(POTFILE)_ > $(POTFILE).new
+		-e 's/UTF-8/CHARSET/' -e 's/PACKAGE/ResidualVM/' $(POTFILE)_ > $(POTFILE).new
 
 	rm $(POTFILE)_
 	if test -f $(POTFILE); then \

ports.mk

@@ -10,27 +10,27 @@ install:
 	$(INSTALL) -d "$(DESTDIR)$(bindir)"
 	$(INSTALL) -c -s -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
 	$(INSTALL) -d "$(DESTDIR)$(mandir)/man6/"
-	$(INSTALL) -c -m 644 "$(srcdir)/dists/residual.6" "$(DESTDIR)$(mandir)/man6/residual.6"
+	$(INSTALL) -c -m 644 "$(srcdir)/dists/residualvm.6" "$(DESTDIR)$(mandir)/man6/residualvm.6"
 	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/pixmaps/"
-	$(INSTALL) -c -m 644 "$(srcdir)/icons/residual.xpm" "$(DESTDIR)$(datarootdir)/pixmaps/residual.xpm"
+	$(INSTALL) -c -m 644 "$(srcdir)/icons/residualvm.xpm" "$(DESTDIR)$(datarootdir)/pixmaps/residualvm.xpm"
 	$(INSTALL) -d "$(DESTDIR)$(docdir)"
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)"
 	$(INSTALL) -d "$(DESTDIR)$(datadir)"
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) "$(DESTDIR)$(datadir)/"
 	#$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
 ifdef DYNAMIC_MODULES
-	$(INSTALL) -d "$(DESTDIR)$(libdir)/residual/"
+	$(INSTALL) -d "$(DESTDIR)$(libdir)/residualvm/"
-	$(INSTALL) -c -s -m 644 $(PLUGINS) "$(DESTDIR)$(libdir)/residual/"
+	$(INSTALL) -c -s -m 644 $(PLUGINS) "$(DESTDIR)$(libdir)/residualvm/"
 endif
 
 uninstall:
 	rm -f "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
-	rm -f "$(DESTDIR)$(mandir)/man6/residual.6"
+	rm -f "$(DESTDIR)$(mandir)/man6/residualvm.6"
-	rm -f "$(DESTDIR)$(datarootdir)/pixmaps/residual.xpm"
+	rm -f "$(DESTDIR)$(datarootdir)/pixmaps/residualvm.xpm"
 	rm -rf "$(DESTDIR)$(docdir)"
 	rm -rf "$(DESTDIR)$(datadir)"
 ifdef DYNAMIC_MODULES
-	rm -rf "$(DESTDIR)$(libdir)/residual/"
+	rm -rf "$(DESTDIR)$(libdir)/residualvm/"
 endif
 
 deb:
@@ -39,13 +39,13 @@ deb:
 	fakeroot debian/rules binary
 
 # Special target to create a application wrapper for Mac OS X
-bundle_name = Residual.app
+bundle_name = ResidualVM.app
-bundle: residual-static
+bundle: residualvm-static
 	mkdir -p $(bundle_name)/Contents/MacOS
 	mkdir -p $(bundle_name)/Contents/Resources
 	echo "APPL????" > $(bundle_name)/Contents/PkgInfo
 	cp $(srcdir)/dists/macosx/Info.plist $(bundle_name)/Contents/
-	cp $(srcdir)/icons/residual.icns $(bundle_name)/Contents/Resources/
+	cp $(srcdir)/icons/residualvm.icns $(bundle_name)/Contents/Resources/
 	cp $(DIST_FILES_DOCS) $(bundle_name)/
 	cp $(DIST_FILES_THEMES) $(bundle_name)/Contents/Resources/
 ifdef DIST_FILES_ENGINEDATA
@@ -53,9 +53,9 @@ ifdef DIST_FILES_ENGINEDATA
 endif
 	$(srcdir)/devtools/credits.pl --rtf > $(bundle_name)/Contents/Resources/Credits.rtf
 	chmod 644 $(bundle_name)/Contents/Resources/*
-	cp residual-static $(bundle_name)/Contents/MacOS/residual
+	cp residualvm-static $(bundle_name)/Contents/MacOS/residualvm
-	chmod 755 $(bundle_name)/Contents/MacOS/residual
+	chmod 755 $(bundle_name)/Contents/MacOS/residualvm
-	$(STRIP) $(bundle_name)/Contents/MacOS/residual
+	$(STRIP) $(bundle_name)/Contents/MacOS/residualvm
 
 iphonebundle: iphone
 	mkdir -p $(bundle_name)
@@ -65,17 +65,17 @@ iphonebundle: iphone
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(bundle_name)/
 endif
-	$(STRIP) residual
+	$(STRIP) residualvm
-	ldid -S residual
+	ldid -S residualvm
-	chmod 755 residual
+	chmod 755 residualvm
-	cp residual $(bundle_name)/Residual
+	cp residual $(bundle_name)/ResidualVM
 	cp $(srcdir)/dists/iphone/icon.png $(bundle_name)/
 	cp $(srcdir)/dists/iphone/icon-72.png $(bundle_name)/
 	cp $(srcdir)/dists/iphone/Default.png $(bundle_name)/
 
 # Location of static libs for the iPhone
 ifneq ($(BACKEND), iphone)
-# Static libaries, used for the residual-static and iphone targets
+# Static libaries, used for the residualvm-static and iphone targets
 OSX_STATIC_LIBS := `$(SDLCONFIG) --static-libs`
 endif
 
@@ -125,8 +125,8 @@ endif
 # Special target to create a static linked binary for Mac OS X.
 # We use -force_cpusubtype_ALL to ensure the binary runs on every
 # PowerPC machine.
-residual-static: $(OBJS)
+residualvm-static: $(OBJS)
-	$(CXX) $(LDFLAGS) -force_cpusubtype_ALL -o residual-static $(OBJS) \
+	$(CXX) $(LDFLAGS) -force_cpusubtype_ALL -o residualvm-static $(OBJS) \
 		-framework CoreMIDI \
 		$(OSX_STATIC_LIBS) \
 		$(OSX_ZLIB) \
@@ -134,7 +134,7 @@ residual-static: $(OBJS)
 
 # Special target to create a static linked binary for the iPhone
 iphone: $(OBJS)
-	$(CXX) $(LDFLAGS) -o residual $(OBJS) \
+	$(CXX) $(LDFLAGS) -o residualvm $(OBJS) \
 		$(OSX_STATIC_LIBS) \
 		-framework UIKit -framework CoreGraphics -framework OpenGLES \
 		-framework GraphicsServices -framework CoreFoundation -framework QuartzCore \
@@ -144,32 +144,32 @@ iphone: $(OBJS)
 # Special target to create a snapshot disk image for Mac OS X
 # TODO: Replace AUTHORS by Credits.rtf
 osxsnap: bundle
-	mkdir Residual-snapshot
+	mkdir ResidualVM-snapshot
 	$(srcdir)/devtools/credits.pl --text > $(srcdir)/AUTHORS
-	cp $(srcdir)/AUTHORS ./Residual-snapshot/Authors
+	cp $(srcdir)/AUTHORS ./ResidualVM-snapshot/Authors
-	cp $(srcdir)/COPYING ./Residual-snapshot/License\ \(GPL\)
+	cp $(srcdir)/COPYING ./ResidualVM-snapshot/License\ \(GPL\)
-	cp $(srcdir)/COPYING.LGPL ./Residual-snapshot/License\ \(LGPL\)
+	cp $(srcdir)/COPYING.LGPL ./ResidualVM-snapshot/License\ \(LGPL\)
-	cp $(srcdir)/COPYRIGHT ./Residual-snapshot/Copyright\ Holders
+	cp $(srcdir)/COPYRIGHT ./ResidualVM-snapshot/Copyright\ Holders
-	cp $(srcdir)/NEWS ./Residual-snapshot/News
+	cp $(srcdir)/NEWS ./ResidualVM-snapshot/News
-	cp $(srcdir)/README ./Residual-snapshot/Residual\ ReadMe
+	cp $(srcdir)/README ./ResidualVM-snapshot/Residual\ ReadMe
-	/Developer/Tools/SetFile -t ttro -c ttxt ./Residual-snapshot/*
+	/Developer/Tools/SetFile -t ttro -c ttxt ./ResidualVM-snapshot/*
-	/Developer/Tools/CpMac -r $(bundle_name) ./Residual-snapshot/
+	/Developer/Tools/CpMac -r $(bundle_name) ./ResidualVM-snapshot/
-	#cp $(srcdir)/dists/macosx/DS_Store ./Residual-snapshot/.DS_Store
+	#cp $(srcdir)/dists/macosx/DS_Store ./ResidualVM-snapshot/.DS_Store
-	#cp $(srcdir)/dists/macosx/background.jpg ./Residual-snapshot/background.jpg
+	#cp $(srcdir)/dists/macosx/background.jpg ./ResidualVM-snapshot/background.jpg
-	#/Developer/Tools/SetFile -a V ./Residual-snapshot/.DS_Store
+	#/Developer/Tools/SetFile -a V ./ResidualVM-snapshot/.DS_Store
-	#/Developer/Tools/SetFile -a V ./Residual-snapshot/background.jpg
+	#/Developer/Tools/SetFile -a V ./ResidualVM-snapshot/background.jpg
 	hdiutil create -ov -format UDZO -imagekey zlib-level=9 -fs HFS+ \
-					-srcfolder Residual-snapshot \
+					-srcfolder ResidualVM-snapshot \
-					-volname "Residual" \
+					-volname "ResidualVM" \
-					Residual-snapshot.dmg
+					ResidualVM-snapshot.dmg
-	rm -rf Residual-snapshot
+	rm -rf ResidualVM-snapshot
 
 #
 # Windows specific
 #
 
-residualwinres.o: $(srcdir)/icons/residual.ico $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(srcdir)/dists/residual.rc
+residualvmwinres.o: $(srcdir)/icons/residualvm.ico $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(srcdir)/dists/residualvm.rc
-	$(QUIET_WINDRES)$(WINDRES) -DHAVE_CONFIG_H $(WINDRESFLAGS) $(DEFINES) -I. -I$(srcdir) $(srcdir)/dists/residual.rc residualwinres.o
+	$(QUIET_WINDRES)$(WINDRES) -DHAVE_CONFIG_H $(WINDRESFLAGS) $(DEFINES) -I. -I$(srcdir) $(srcdir)/dists/residualvm.rc residualvmwinres.o
 
 # Special target to create a win32 snapshot binary
 win32dist: $(EXECUTABLE)
@@ -188,29 +188,29 @@ endif
 	cp $(srcdir)/README $(WIN32PATH)/README.txt
 	cp /usr/local/README-SDL.txt $(WIN32PATH)
 	cp /usr/local/bin/SDL.dll $(WIN32PATH)
-	cp $(srcdir)/icons/residual.ico $(WIN32PATH)
+	cp $(srcdir)/icons/residualvm.ico $(WIN32PATH)
-	cp $(srcdir)/dists/residual.iss $(WIN32PATH)
+	cp $(srcdir)/dists/residualvm.iss $(WIN32PATH)
 	unix2dos $(WIN32PATH)/*.txt
 
 # Special target to create a win32 snapshot binary under Debian Linux using cross mingw32 toolchain
 crosswin32dist: $(EXECUTABLE)
-	mkdir -p ResidualWin32
+	mkdir -p ResidualVMWin32
-	$(STRIP) $(EXECUTABLE) -o ResidualWin32/$(EXECUTABLE)
+	$(STRIP) $(EXECUTABLE) -o ResidualVMWin32/$(EXECUTABLE)
-	cp $(DIST_FILES_THEMES) ResidualWin32
+	cp $(DIST_FILES_THEMES) ResidualVMWin32
 ifdef DIST_FILES_ENGINEDATA
-	cp $(DIST_FILES_ENGINEDATA) ResidualWin32
+	cp $(DIST_FILES_ENGINEDATA) ResidualVMWin32
 endif
-	cp $(srcdir)/AUTHORS ResidualWin32/AUTHORS.txt
+	cp $(srcdir)/AUTHORS ResidualVMWin32/AUTHORS.txt
-	cp $(srcdir)/COPYING ResidualWin32/COPYING.txt
+	cp $(srcdir)/COPYING ResidualVMWin32/COPYING.txt
-	cp $(srcdir)/COPYING.LGPL ResidualWin32/COPYING.LGPL.txt
+	cp $(srcdir)/COPYING.LGPL ResidualVMWin32/COPYING.LGPL.txt
-	cp $(srcdir)/COPYRIGHT ResidualWin32/COPYRIGHT.txt
+	cp $(srcdir)/COPYRIGHT ResidualVMWin32/COPYRIGHT.txt
-	cp $(srcdir)/NEWS ResidualWin32/NEWS.txt
+	cp $(srcdir)/NEWS ResidualVMWin32/NEWS.txt
-	cp $(srcdir)/README ResidualWin32/README.txt
+	cp $(srcdir)/README ResidualVMWin32/README.txt
-	cp $(srcdir)/dists/residual.iss ResidualWin32
+	cp $(srcdir)/dists/residualvm.iss ResidualWin32
-	cp /usr/i586-mingw32msvc/README-SDL.txt ResidualWin32
+	cp /usr/i586-mingw32msvc/README-SDL.txt ResidualVMWin32
-	cp /usr/i586-mingw32msvc/bin/SDL.dll ResidualWin32
+	cp /usr/i586-mingw32msvc/bin/SDL.dll ResidualVMWin32
-	toms ResidualWin32/*.txt
+	toms ResidualVMWin32/*.txt
-	toms ResidualWin32/residual.iss
+	toms ResidualVMWin32/residualvm.iss
 
 #
 # AmigaOS specific
@@ -220,7 +220,7 @@ endif
 aos4dist: $(EXECUTABLE)
 	mkdir -p $(AOS4PATH)
 	$(STRIP) $(EXECUTABLE) -o $(AOS4PATH)/$(EXECUTABLE)
-	cp icons/residual.info $(AOS4PATH)/$(EXECUTABLE).info
+	cp icons/residualvm.info $(AOS4PATH)/$(EXECUTABLE).info
 	cp $(DIST_FILES_THEMES) $(AOS4PATH)/themes/
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(AOS4PATH)/extras/
@@ -247,7 +247,7 @@ endif
 	cp $(srcdir)/dists/ps3/ICON0.PNG ps3pkg/
 	cp $(srcdir)/dists/ps3/PIC1.PNG ps3pkg/
 	sfo.py -f $(srcdir)/dists/ps3/sfo.xml ps3pkg/PARAM.SFO
-	pkg.py --contentid UP0001-SCUM12000_00-0000000000000000 ps3pkg/ scummvm-ps3.pkg
+	pkg.py --contentid UP0001-SCUM12000_00-0000000000000000 ps3pkg/ residualvm-ps3.pkg
 	package_finalize residual-ps3.pkg
 
 # Mark special targets as phony