Make parameter name and log message more clear. ref #310