diff --git a/Testing/Unit/elxDataManager.cxx b/Testing/Unit/elxDataManager.cxx
index 7cc481db1157b2e9a0956a2af4630205b830d288..e9c41d69803246304c8b5bff70af086dc8a75cac 100644
--- a/Testing/Unit/elxDataManager.cxx
+++ b/Testing/Unit/elxDataManager.cxx
@@ -6,7 +6,7 @@
 
 const std::string
 DataManager
-::GetInputFullPath( const std::string filename ) const 
+::GetInputFile( const std::string filename ) const 
 {
   const std::string path = this->GetInputDirectory() + this->GetFolderSeparator() + filename;
   return path;
@@ -14,7 +14,7 @@ DataManager
 
 const std::string
 DataManager
-::GetOutputFullPath( const std::string filename ) const
+::GetOutputFile( const std::string filename ) const
 {
   const std::string path = this->GetOutputDirectory() + this->GetFolderSeparator() + filename;
   return path;
@@ -22,7 +22,7 @@ DataManager
 
 const std::string
 DataManager
-::GetBaselineFullPath( const std::string filename ) const
+::GetBaselineFile( const std::string filename ) const
 {
   const std::string path = this->GetBaselineDirectory() + this->GetFolderSeparator() + filename;
   return path;
diff --git a/Testing/Unit/elxDataManager.h b/Testing/Unit/elxDataManager.h
index 5bd4a091c590bcce2d978ded0525ab34f4091d5a..2d3f8e4b2389f6a5d7c0d7e6f520a28babe015a2 100644
--- a/Testing/Unit/elxDataManager.h
+++ b/Testing/Unit/elxDataManager.h
@@ -26,9 +26,9 @@ public:
   std::string GetOutputDirectory( void ) const { return this->m_OutputDirectory; };
   std::string GetBaselineDirectory( void ) const { return this->m_BaselineDirectory; };
 
-  const std::string GetInputFullPath( const std::string filename ) const;
-  const std::string GetOutputFullPath( const std::string filename ) const;
-  const std::string GetBaselineFullPath( const std::string filename ) const;
+  const std::string GetInputFile( const std::string filename ) const;
+  const std::string GetOutputFile( const std::string filename ) const;
+  const std::string GetBaselineFile( const std::string filename ) const;
 
   std::string GetFolderSeparator() const
   {