diff --git a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index f92e5268a8..e30a0e76a1 100644
--- a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -22,7 +22,7 @@
 		<Compile Update="Arcades/MAME/MAME.*.cs" DependentUpon="MAME.cs" />
 		<Compile Update="Calculators/Emu83/Emu83.*.cs" DependentUpon="Emu83.cs" />
 		<Compile Update="Calculators/TI83/TI83.*.cs" DependentUpon="TI83.cs" />
-		<Compile Update="Computers/Amiga/PUAE.*.cs" DependentUpon="PUAE.cs" />
+		<Compile Update="Computers/Amiga/UAE.*.cs" DependentUpon="UAE.cs" />
 		<Compile Update="Computers/AppleII/AppleII.*.cs" DependentUpon="AppleII.cs" />
 		<Compile Update="Computers/Commodore64/C64.*.cs" DependentUpon="C64.cs" />
 		<Compile Update="Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.*.cs" DependentUpon="NECUPD765.cs" />
diff --git a/src/BizHawk.Emulation.Cores/Computers/Amiga/UAE.cs b/src/BizHawk.Emulation.Cores/Computers/Amiga/UAE.cs
index 1885c530cf..5b2ed86f45 100644
--- a/src/BizHawk.Emulation.Cores/Computers/Amiga/UAE.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/Amiga/UAE.cs
@@ -18,7 +18,7 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
 		private static readonly Configuration ConfigPAL = new Configuration
 		{
 			SystemId = VSystemID.Raw.Amiga,
-			MaxSamples = 2 * 1024,
+			MaxSamples = 8 * 1024,
 			DefaultWidth = LibUAE.PAL_WIDTH,
 			DefaultHeight = LibUAE.PAL_HEIGHT,
 			MaxWidth = LibUAE.PAL_WIDTH,
@@ -30,7 +30,7 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
 		private static readonly Configuration ConfigNTSC = new Configuration
 		{
 			SystemId = VSystemID.Raw.Amiga,
-			MaxSamples = 2 * 1024,
+			MaxSamples = 8 * 1024,
 			DefaultWidth = LibUAE.NTSC_WIDTH,
 			DefaultHeight = LibUAE.NTSC_HEIGHT,
 			// games never switch region, and video dumping won't be happy, but amiga can still do it