diff --git a/include/audio_port.h b/include/audio_port.h
index 357c7ae8a..68aec4415 100644
--- a/include/audio_port.h
+++ b/include/audio_port.h
@@ -39,11 +39,11 @@ public:
 	audioPort( const QString & _name, track * _track );
 	~audioPort();
 
-	inline surroundSampleFrame * firstBuffer( void )
+	inline sampleFrame * firstBuffer( void )
 	{
 		return( m_firstBuffer );
 	}
-	inline surroundSampleFrame * secondBuffer( void )
+	inline sampleFrame * secondBuffer( void )
 	{
 		return( m_secondBuffer );
 	}
@@ -120,8 +120,8 @@ public:
 	}
 
 private:
-	surroundSampleFrame * m_firstBuffer;
-	surroundSampleFrame * m_secondBuffer;
+	sampleFrame * m_firstBuffer;
+	sampleFrame * m_secondBuffer;
 	QMutex m_firstBufferLock;
 	QMutex m_secondBufferLock;
 
diff --git a/src/core/audio/audio_port.cpp b/src/core/audio/audio_port.cpp
index 6567401f0..46e459fa3 100644
--- a/src/core/audio/audio_port.cpp
+++ b/src/core/audio/audio_port.cpp
@@ -35,9 +35,8 @@
 
 audioPort::audioPort( const QString & _name, track * _track ) :
 	m_bufferUsage( NoUsage ),
-	m_firstBuffer( new surroundSampleFrame[
-				engine::getMixer()->framesPerPeriod()] ),
-	m_secondBuffer( new surroundSampleFrame[
+	m_firstBuffer( new sampleFrame[engine::getMixer()->framesPerPeriod()] ),
+	m_secondBuffer( new sampleFrame[
 				engine::getMixer()->framesPerPeriod()] ),
 	m_extOutputEnabled( FALSE ),
 	m_nextFxChannel( 0 ),