diff --git a/packages/xpetra/src/Vector/Xpetra_TpetraVector_def.hpp b/packages/xpetra/src/Vector/Xpetra_TpetraVector_def.hpp
index 5d5eb7b71e0cd005cc88f7d3e2740f64b15a12a4..43530fe31b4dd4e2dd9ea27eb90d8376e5397a23 100644
--- a/packages/xpetra/src/Vector/Xpetra_TpetraVector_def.hpp
+++ b/packages/xpetra/src/Vector/Xpetra_TpetraVector_def.hpp
@@ -174,7 +174,10 @@ template<class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node>
     typedef EpetraNode Node;
 
 #undef XPETRA_TPETRAMULTIVECTOR_SHORT
+#undef XPETRA_TPETRAVECTOR_SHORT
 #include "Xpetra_UseShortNames.hpp"
+#define XPETRA_TPETRAMULTIVECTOR_SHORT
+#define XPETRA_TPETRAVECTOR_SHORT
 
   public:
 
@@ -332,7 +335,10 @@ template<class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node>
     typedef EpetraNode Node;
 
 #undef XPETRA_TPETRAMULTIVECTOR_SHORT
+#undef XPETRA_TPETRAVECTOR_SHORT
 #include "Xpetra_UseShortNames.hpp"
+#define XPETRA_TPETRAMULTIVECTOR_SHORT
+#define XPETRA_TPETRAVECTOR_SHORT
 
   public: