diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriver.h b/stepmania/src/arch/MemoryCard/MemoryCardDriver.h
index 52f54c32d8..909fce0b05 100644
--- a/stepmania/src/arch/MemoryCard/MemoryCardDriver.h
+++ b/stepmania/src/arch/MemoryCard/MemoryCardDriver.h
@@ -12,7 +12,7 @@ struct UsbStorageDevice
 		iPort = -1;
 		iLevel = -1;
 		iScsiIndex = -1;
-		sScsiDevice = "";
+		sDevice = "";
 		sSerial = "<none>"; // be different than a card with no serial
 		sOsMountDir = "";
 		m_State = STATE_NONE;
@@ -28,7 +28,7 @@ struct UsbStorageDevice
 	int iLevel;
 	CString sSerial;
 	int iScsiIndex;
-	CString sScsiDevice;
+	CString sDevice;
 	CString	sOsMountDir;	// WITHOUT trailing slash
 	enum State
 	{
diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
index 1b5e0a3b3c..524d5e2c63 100644
--- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
+++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
@@ -336,7 +336,7 @@ void GetNewStorageDevices( vector<UsbStorageDevice>& vDevicesOut )
 				continue;
 
 
-			usbd.sScsiDevice = "/dev/" + sDevice;
+			usbd.sDevice = "/dev/" + sDevice;
 
 			/*
 			 * sPath/device should be a symlink to the actual device.  For USB
@@ -456,16 +456,16 @@ void GetNewStorageDevices( vector<UsbStorageDevice>& vDevicesOut )
 			TrimLeft( sMountPoint );
 			TrimRight( sMountPoint );
 			
-			// search for the usb-storage device corresponding to the SCSI device
+			// search for the mountpoint corresponding to the device
 			for( unsigned i=0; i<vDevicesOut.size(); i++ )
 			{
 				UsbStorageDevice& usbd = vDevicesOut[i];
-				if( usbd.sScsiDevice+"1" == szScsiDevice )	// found our match
+				if( usbd.sDevice+"1" == szScsiDevice )	// found our match
 				{
 					usbd.sOsMountDir = sMountPoint;
 					
-					LOG->Trace( "iScsiIndex: %d, sScsiDevice: %s, iBus: %d, iLevel: %d, iPort: %d, sOsMountDir: %s",
-						usbd.iScsiIndex, usbd.sScsiDevice.c_str(), usbd.iBus, usbd.iLevel, usbd.iPort, usbd.sOsMountDir.c_str() );
+					LOG->Trace( "iScsiIndex: %d, sDevice: %s, iBus: %d, iLevel: %d, iPort: %d, sOsMountDir: %s",
+						usbd.iScsiIndex, usbd.sDevice.c_str(), usbd.iBus, usbd.iLevel, usbd.iPort, usbd.sOsMountDir.c_str() );
 					
 					break;	// stop looking for a match
 				}