diff --git a/src/blockforest/communication/UniformBufferedScheme.h b/src/blockforest/communication/UniformBufferedScheme.h
index 93216ef8cc202cc7c4d450a835accfbc92c2240e..b9c07bbecdd767fcb0dbcd0198fd6eedbfeb1b54 100644
--- a/src/blockforest/communication/UniformBufferedScheme.h
+++ b/src/blockforest/communication/UniformBufferedScheme.h
@@ -77,11 +77,11 @@ namespace communication {
 * for the schemes: the tag can be passed in the constructor.
 */
 //*******************************************************************************************************************
-template< typename Stencil >
+template< typename Stencil_T >
 class UniformBufferedScheme
 {
 public:
-
+   typedef Stencil_T Stencil;
    typedef mpi::SendBuffer SendBuffer;
    typedef mpi::RecvBuffer RecvBuffer;
 
diff --git a/src/blockforest/communication/UniformDirectScheme.h b/src/blockforest/communication/UniformDirectScheme.h
index 86393089342eb96c0134148a3518647b0cb2d7d0..bf3a73344604c24728eb34264cfb9027c485c938 100644
--- a/src/blockforest/communication/UniformDirectScheme.h
+++ b/src/blockforest/communication/UniformDirectScheme.h
@@ -45,11 +45,11 @@ namespace communication {
 *
 */
 //*******************************************************************************************************************
-template< typename Stencil >
+template< typename Stencil_T >
 class UniformDirectScheme
 {
 public:
-
+   typedef Stencil_T Stencil;
    typedef walberla::communication::UniformMPIDatatypeInfo UniformMPIDatatypeInfo;
    typedef walberla::communication::UniformMPIDatatypeInfo CommunicationItemInfo;