diff --git a/extended/test_ac_cycles.robot b/extended/test_ac_cycles.robot
index b8505f0..aaae01e 100644
--- a/extended/test_ac_cycles.robot
+++ b/extended/test_ac_cycles.robot
@@ -9,7 +9,7 @@
 
 Suite Setup       Open Connection And Log In
 Suite Teardown    Close All Connections
-Test Teardown     Log FFDC
+Test Teardown     FFDC On Test Case Fail
 
 *** Test Cases ***
 Test openbmc buster
diff --git a/extended/test_networkd_ext.robot b/extended/test_networkd_ext.robot
index 555e5c9..d966976 100755
--- a/extended/test_networkd_ext.robot
+++ b/extended/test_networkd_ext.robot
@@ -9,7 +9,7 @@
 
 Suite Setup         Open Connection And Log In
 Suite Teardown      Close All Connections
-Test Teardown       Log FFDC
+Test Teardown       FFDC On Test Case Fail
 
 *** Test Cases ***
 
diff --git a/extended/test_power_restore.robot b/extended/test_power_restore.robot
index 47e13aa..e6d90c4 100644
--- a/extended/test_power_restore.robot
+++ b/extended/test_power_restore.robot
@@ -13,7 +13,7 @@
 
 Library         SSHLibrary
 
-Test Teardown   Log FFDC
+Test Teardown   FFDC On Test Case Fail
 Force Tags      chassisboot  bmcreboot
 
 *** Variables ***
diff --git a/extended/test_powercycle_loop.robot b/extended/test_powercycle_loop.robot
index 786f9c1..37b991c 100644
--- a/extended/test_powercycle_loop.robot
+++ b/extended/test_powercycle_loop.robot
@@ -39,7 +39,7 @@
 
 Test Exit Logs
     Ping Host  ${OPENBMC_HOST}
-    Log FFDC
+    FFDC On Test Case Fail
 
 
 Validate Parameters
diff --git a/extended/test_syslog.robot b/extended/test_syslog.robot
index d2004c7..8be14a9 100755
--- a/extended/test_syslog.robot
+++ b/extended/test_syslog.robot
@@ -9,7 +9,7 @@
 
 Suite Setup         Open Connection And Log In
 Suite Teardown      Close All Connections
-Test Teardown       Log FFDC
+Test Teardown       FFDC On Test Case Fail
 
 
 *** Variables ***
diff --git a/lib/openbmc_ffdc.robot b/lib/openbmc_ffdc.robot
index aa7c3b2..d1b67f5 100755
--- a/lib/openbmc_ffdc.robot
+++ b/lib/openbmc_ffdc.robot
@@ -33,7 +33,7 @@
 
 *** Keywords ***
 
-Log FFDC
+FFDC On Test Case Fail
     [Documentation]   Generic FFDC entry point. Place holder to hook in
     ...               other data collection methods
     ...               1. Collect Logs if test fails
@@ -43,12 +43,12 @@
     ...                      20160822041250969913:Test:Test case 2:FAIL
 
     Run Keyword If  '${TEST_STATUS}' == 'FAIL'
-    ...    Log FFDC If Test Case Failed
+    ...    FFDC
 
     Log Test Case Status
 
 
-Log FFDC If Test Case Failed
+FFDC
     [Documentation]   Main entry point to gather logs on Test case failure
     ...               1. Set global FFDC time reference for a failure
     ...               2. Create FFDC work space directory
diff --git a/tests/security/test_ssl.robot b/tests/security/test_ssl.robot
index 76a145c..405105b 100644
--- a/tests/security/test_ssl.robot
+++ b/tests/security/test_ssl.robot
@@ -5,7 +5,7 @@
 Resource          ../../lib/rest_client.robot
 Resource          ../../lib/resource.txt
 Resource          ../../lib/openbmc_ffdc.robot
-Test Teardown     Log FFDC
+Test Teardown     FFDC On Test Case Fail
 
 *** Test Cases ***
 Test SSL Connection
diff --git a/tests/test_association.robot b/tests/test_association.robot
index fc42aa8..dacf0a1 100755
--- a/tests/test_association.robot
+++ b/tests/test_association.robot
@@ -11,7 +11,7 @@
 Suite Setup       Suite Initialization Setup
 Suite Teardown    Close All Connections
 
-Test Teardown     Log FFDC
+Test Teardown     FFDC On Test Case Fail
 
 *** Variables ***
 
diff --git a/tests/test_basic_poweron.robot b/tests/test_basic_poweron.robot
index 0aeb069..cde92e3 100644
--- a/tests/test_basic_poweron.robot
+++ b/tests/test_basic_poweron.robot
@@ -23,6 +23,6 @@
 Test Exit Logs
     [Documentation]    Log FFDC if failed and collect SOL
     ...                Logs for debugging purpose.
-    Log FFDC
+    FFDC On Test Case Fail
     ${sol_log}=    Stop SOL Console Logging
     Log   ${sol_log}
diff --git a/tests/test_boot.robot b/tests/test_boot.robot
index 60ef219..e7dee22 100644
--- a/tests/test_boot.robot
+++ b/tests/test_boot.robot
@@ -10,7 +10,7 @@
 Suite Setup     Open Connection And Log In
 Suite Teardown  Close All Connections
 Test Setup      Initialize DBUS cmd   "boot_flags"
-Test Teardown   Log FFDC
+Test Teardown   FFDC On Test Case Fail
 *** Variables ***
 
 *** Test Cases ***
diff --git a/tests/test_bootpolicy.robot b/tests/test_bootpolicy.robot
index cfcf44d..279bc34 100644
--- a/tests/test_bootpolicy.robot
+++ b/tests/test_bootpolicy.robot
@@ -10,7 +10,7 @@
 Suite Setup        Open Connection And Log In
 Suite Teardown     Close All Connections
 Test Setup         Initialize DBUS cmd   "boot_policy"
-Test Teardown      Log FFDC
+Test Teardown      FFDC On Test Case Fail
 
 *** Variables ***
 
diff --git a/tests/test_esel.robot b/tests/test_esel.robot
index 0945040..d4efb9a 100644
--- a/tests/test_esel.robot
+++ b/tests/test_esel.robot
@@ -7,7 +7,7 @@
 
 Suite Setup            Open Connection And Log In
 Suite Teardown         Close All Connections
-Test Teardown          Log FFDC
+Test Teardown          FFDC On Test Case Fail
 
 *** Test Cases ***
 
diff --git a/tests/test_eventlog.robot b/tests/test_eventlog.robot
index dee0799..d2eadc4 100644
--- a/tests/test_eventlog.robot
+++ b/tests/test_eventlog.robot
@@ -11,7 +11,7 @@
 
 Suite Setup       Open Connection And Log In
 Suite Teardown    Close All Connections
-Test Teardown     Log FFDC
+Test Teardown     FFDC On Test Case Fail
 
 *** Variables ***
 &{NIL}  data=@{EMPTY}
diff --git a/tests/test_fan.robot b/tests/test_fan.robot
index 718ad5e..ce7e990 100644
--- a/tests/test_fan.robot
+++ b/tests/test_fan.robot
@@ -3,7 +3,7 @@
 Suite Teardown    Delete All Sessions
 Resource          ../lib/rest_client.robot
 Resource          ../lib/openbmc_ffdc.robot
-Test Teardown     Log FFDC
+Test Teardown     FFDC On Test Case Fail
 
 *** Test Cases ***
 Empty Fan Test
diff --git a/tests/test_fw_version.robot b/tests/test_fw_version.robot
index c66a1d7..d1d566b 100755
--- a/tests/test_fw_version.robot
+++ b/tests/test_fw_version.robot
@@ -4,7 +4,7 @@
 
 Resource            ../lib/rest_client.robot
 Resource            ../lib/openbmc_ffdc.robot
-Test Teardown       Log FFDC
+Test Teardown       FFDC On Test Case Fail
 
 
 *** Variables ***
diff --git a/tests/test_generic_conf.robot b/tests/test_generic_conf.robot
index f2a4913..b01af32 100755
--- a/tests/test_generic_conf.robot
+++ b/tests/test_generic_conf.robot
@@ -5,7 +5,7 @@
 
 Resource          ../lib/rest_client.robot
 Resource          ../lib/openbmc_ffdc.robot
-Test Teardown     Log FFDC
+Test Teardown     FFDC On Test Case Fail
 
 
 *** Variables ***
diff --git a/tests/test_inventory.robot b/tests/test_inventory.robot
index 380a11f..1d3667c 100644
--- a/tests/test_inventory.robot
+++ b/tests/test_inventory.robot
@@ -8,7 +8,7 @@
 Library           ../lib/utilities.py
 Library           String
 Library           Collections
-Test Teardown     Log FFDC
+Test Teardown     FFDC On Test Case Fail
 
 Variables         ../data/variables.py
 
diff --git a/tests/test_led.robot b/tests/test_led.robot
index 86798db..e084f09 100644
--- a/tests/test_led.robot
+++ b/tests/test_led.robot
@@ -6,7 +6,7 @@
 Resource          ../lib/rest_client.robot
 Resource          ../lib/resource.txt
 Resource          ../lib/openbmc_ffdc.robot
-Test Teardown     Log FFDC
+Test Teardown     FFDC On Test Case Fail
 
 *** Variables ***
 
diff --git a/tests/test_networkd.robot b/tests/test_networkd.robot
index bfd3fc7..3c856ec 100755
--- a/tests/test_networkd.robot
+++ b/tests/test_networkd.robot
@@ -11,7 +11,7 @@
 
 Suite Setup         Open Connection And Log In
 Suite Teardown      Close All Connections
-Test Teardown       Log FFDC
+Test Teardown       FFDC On Test Case Fail
 
 *** Test Cases ***
 
diff --git a/tests/test_obmcrest.robot b/tests/test_obmcrest.robot
index b15e494..aa26bcd 100644
--- a/tests/test_obmcrest.robot
+++ b/tests/test_obmcrest.robot
@@ -5,7 +5,7 @@
 
 Resource          ../lib/rest_client.robot
 Resource          ../lib/openbmc_ffdc.robot
-Test Teardown     Log FFDC
+Test Teardown     FFDC On Test Case Fail
 
 
 *** Variables ***
diff --git a/tests/test_occ_powercap.robot b/tests/test_occ_powercap.robot
index d008ebc..0847350 100644
--- a/tests/test_occ_powercap.robot
+++ b/tests/test_occ_powercap.robot
@@ -8,7 +8,7 @@
 Resource                ../lib/boot/boot_resource_master.robot
 
 Suite Setup             Check OCC Readiness
-Test Teardown           Log FFDC
+Test Teardown           FFDC On Test Case Fail
 
 Force Tags   powercapping
 
diff --git a/tests/test_openbmc_service_restart_policy.robot b/tests/test_openbmc_service_restart_policy.robot
index 6062526..09f2617 100644
--- a/tests/test_openbmc_service_restart_policy.robot
+++ b/tests/test_openbmc_service_restart_policy.robot
@@ -8,7 +8,7 @@
 
 Suite Setup          Open Connection And Log In
 Suite Teardown       Close All Connections
-Test Teardown        Log FFDC
+Test Teardown        FFDC On Test Case Fail
 
 *** Test Cases ***
 Test OpenBMC Services Autorestart Policy
diff --git a/tests/test_sensors.robot b/tests/test_sensors.robot
index 79ce8c2..57f1a1d 100644
--- a/tests/test_sensors.robot
+++ b/tests/test_sensors.robot
@@ -12,7 +12,7 @@
 
 Suite setup            Setup The Suite
 Suite Teardown         Close All Connections
-Test Teardown          Log FFDC
+Test Teardown          FFDC On Test Case Fail
 
 
 *** Variables ***
diff --git a/tests/test_time.robot b/tests/test_time.robot
index 68ea16f..fe90337 100755
--- a/tests/test_time.robot
+++ b/tests/test_time.robot
@@ -9,7 +9,7 @@
 
 Suite Setup            Open Connection And Log In
 Suite Teardown         Close All Connections
-Test Teardown          Log FFDC
+Test Teardown          FFDC On Test Case Fail
 
 *** Variables ***
 ${SYSTEM_TIME_INVALID}     01/01/1969 00:00:00
diff --git a/tests/test_user.robot b/tests/test_user.robot
index 39598bf..d9e02cd 100755
--- a/tests/test_user.robot
+++ b/tests/test_user.robot
@@ -15,7 +15,7 @@
 Library             OperatingSystem
 Library             SSHLibrary
 Library             String
-Test Teardown       Log FFDC
+Test Teardown       FFDC On Test Case Fail
 
 *** Variables ***
 ${RANDOM_STRING_LENGTH}    ${8}
diff --git a/tests/test_warmreset.robot b/tests/test_warmreset.robot
index 6009cb0..d6427a9 100644
--- a/tests/test_warmreset.robot
+++ b/tests/test_warmreset.robot
@@ -10,7 +10,7 @@
 
 Suite Setup             Open Connection And Log In
 Suite Teardown          Close All Connections
-Test Teardown           Log FFDC
+Test Teardown           FFDC On Test Case Fail
 
 *** Variables ***
 ${SYSTEM_SHUTDOWN_TIME}    ${5}
diff --git a/tools/myffdc.robot b/tools/myffdc.robot
index dbc05e8..0fd9c5a 100755
--- a/tools/myffdc.robot
+++ b/tools/myffdc.robot
@@ -7,15 +7,26 @@
 ...                logs
 ...                └── 20161020045522673810_Myffdc
 ...                    └── 20161020045522673810_MyFFDCLogs
-...                        ├── 20161020045522673810_MyFFDCLogs
-...                        ├── 20161020045522673810_BMC_dmesg
-...                        ├── 20161020045522673810_BMC_inventory
-...                        ├── 20161020045522673810_BMC_journalctl.log
-...                        ├── 20161020045522673810_BMC_led
-...                        ├── 20161020045522673810_BMC_proc_list
-...                        ├── 20161020045522673810_BMC_record_log
-...                        ├── 20161020045522673810_BMC_sensor_list
-...                        └── 20161020045522673810_ffdc_report.txt
+...                        ├── 20161020045522673810_BMC_journalctl.txt
+...                        ├── 20161020045522673810_BMC_proc_list.txt
+...                        ├── 20161020045522673810_BMC_dmesg.txt
+...                        ├── 20161020045522673810_BMC_inventory.txt
+...                        ├── 20161020045522673810_BMC_led.txt
+...                        ├── 20161020045522673810_BMC_record_log.txt
+...                        ├── 20161020045522673810_BMC_sensor_list.txt
+...                        ├── 20161020045522673810_BMC_general.txt
+...                        ├── 20161020045522673810_OS_dmesg.txt
+...                        ├── 20161020045522673810_OS_msglog.txt
+...                        ├── 20161020045522673810_OS_cpufrequency.txt
+...                        ├── 20161020045522673810_OS_boot.txt
+...                        ├── 20161020045522673810_OS_isusb.txt
+...                        ├── 20161020045522673810_OS_kern.txt
+...                        ├── 20161020045522673810_OS_authlog.txt
+...                        ├── 20161020045522673810_OS_syslog.txt
+...                        ├── 20161020045522673810_OS_info.txt
+...                        ├── 20161020045522673810_OS_rsct.txt
+...                        └── 20161020045522673810_OS_secure.txt
+
 
 Resource           ../lib/openbmc_ffdc.robot
 
@@ -31,4 +42,4 @@
 ** Keywords ***
 
 Gather FFDC
-    Run Keyword And Ignore Error   Log FFDC If Test Case Failed
+    Run Keyword And Ignore Error   FFDC