From 834ccacbd407015db0343f9a477908409a9c325a Mon Sep 17 00:00:00 2001
From: Salma BOUGACHA <salmabougacha@hotmail.com>
Date: Fri, 2 Feb 2018 11:54:41 +0100
Subject: [PATCH] fix out_file template bugs

---
 nipype/interfaces/afni/tests/test_auto_Merge.py | 2 +-
 nipype/interfaces/afni/tests/test_auto_Zcat.py  | 3 ++-
 nipype/interfaces/afni/utils.py                 | 7 ++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/nipype/interfaces/afni/tests/test_auto_Merge.py b/nipype/interfaces/afni/tests/test_auto_Merge.py
index 02c8f9ca27..7136d04dfc 100644
--- a/nipype/interfaces/afni/tests/test_auto_Merge.py
+++ b/nipype/interfaces/afni/tests/test_auto_Merge.py
@@ -32,7 +32,7 @@ def test_Merge_inputs():
         ),
         out_file=dict(
             argstr='-prefix %s',
-            name_source='in_file',
+            name_source='in_files',
             name_template='%s_merge',
         ),
         outputtype=dict(),
diff --git a/nipype/interfaces/afni/tests/test_auto_Zcat.py b/nipype/interfaces/afni/tests/test_auto_Zcat.py
index d15deb91f0..4a631c6ad6 100644
--- a/nipype/interfaces/afni/tests/test_auto_Zcat.py
+++ b/nipype/interfaces/afni/tests/test_auto_Zcat.py
@@ -36,7 +36,8 @@ def test_Zcat_inputs():
         ),
         out_file=dict(
             argstr='-prefix %s',
-            name_template='zcat',
+            name_source='in_files',
+            name_template='%s_zcat',
         ),
         outputtype=dict(),
         terminal_output=dict(
diff --git a/nipype/interfaces/afni/utils.py b/nipype/interfaces/afni/utils.py
index 188ba158c0..8acdf29f92 100644
--- a/nipype/interfaces/afni/utils.py
+++ b/nipype/interfaces/afni/utils.py
@@ -1434,7 +1434,7 @@ class MergeInputSpec(AFNICommandInputSpec):
         name_template='%s_merge',
         desc='output image file name',
         argstr='-prefix %s',
-        name_source='in_file')
+        name_source='in_files')
     doall = traits.Bool(
         desc='apply options to all sub-bricks in dataset', argstr='-doall')
     blurfwhm = traits.Int(
@@ -2635,9 +2635,10 @@ class ZcatInputSpec(AFNICommandInputSpec):
         mandatory=True,
         copyfile=False)
     out_file = File(
-        name_template='zcat',
+        name_template='%s_zcat',
         desc='output dataset prefix name (default \'zcat\')',
-        argstr='-prefix %s')
+        argstr='-prefix %s',
+        name_source='in_files')
     datum = traits.Enum(
         'byte',
         'short',