diff --git a/h2o-scala/src/main/scala/water/api/dsl/examples/Examples.scala b/h2o-scala/src/main/scala/water/api/dsl/examples/Examples.scala
index 0ccb0a12de..aa9d5f5a8b 100644
--- a/h2o-scala/src/main/scala/water/api/dsl/examples/Examples.scala
+++ b/h2o-scala/src/main/scala/water/api/dsl/examples/Examples.scala
@@ -105,7 +105,7 @@ makes a prediction over train data and compute MSE of prediction."""")
       hidden = Array(1+new Random(seed).nextInt(4), 1+new Random(seed).nextInt(6))
       classification = true
       seed = seed
-      mini_batch = 0
+      train_samples_per_iteration = 0
       force_load_balance = false
       replicate_training_data = true
       shuffle_training_data = true
diff --git a/py/h2o.py b/py/h2o.py
index bc4106d457..1c610fb82b 100644
--- a/py/h2o.py
+++ b/py/h2o.py
@@ -2245,7 +2245,7 @@ def deep_learning(self, data_key, timeoutSecs=60, retryDelaySecs=1, initialDelay
             'activation'                   : None,
             'hidden'                       : None,
             'epochs'                       : None,
-            'mini_batch'                   : None,
+            'train_samples_per_iteration'  : None,
             'seed'                         : None,
             'adaptive_rate'                : None,
             'rho'                          : None,
diff --git a/py/testdir_0xdata_only/test_DeepLearning_mnist.py b/py/testdir_0xdata_only/test_DeepLearning_mnist.py
index c8fec71432..62de386298 100644
--- a/py/testdir_0xdata_only/test_DeepLearning_mnist.py
+++ b/py/testdir_0xdata_only/test_DeepLearning_mnist.py
@@ -52,7 +52,7 @@ def test_DeepLearning_mnist(self):
             'input_dropout_ratio'          : 0.2,
             'hidden'                       : '1024,1024,2048',
             'adaptive_rate'                : 1,
-            'mini_batch'                   : 0, ## 0: better accuracy!  -1: best scalability!  10000: best accuracy?
+            'train_samples_per_iteration'  : 0, ## 0: better accuracy!  -1: best scalability!  10000: best accuracy?
 #            'rate'                         : 0.01,
 #            'rate_annealing'               : 1e-6,
 #            'momentum_start'               : 0.5,
diff --git a/py/testdir_single_jvm/test_NN2_params_rand2.py b/py/testdir_single_jvm/test_NN2_params_rand2.py
index 6799251815..5a67ee17c4 100644
--- a/py/testdir_single_jvm/test_NN2_params_rand2.py
+++ b/py/testdir_single_jvm/test_NN2_params_rand2.py
@@ -30,7 +30,7 @@ def define_params():
         'score_training_samples'       : [None, 0, 1],
         'score_validation_samples'     : [None, 0, 1],
         'score_interval'               : [None, 0, 1],
-        'mini_batch'                   : [None, 0, 1],
+        'train_samples_per_iteration'  : [None, 0, 1],
         'diagnostics'                  : [None, 0, 0, 0, 0, 1],
         'fast_mode'                    : [None, 0, 1],
         'ignore_const_cols'            : [None, 0, 1],