Rename file, add display and fix some error messages

Signed-off-by: Ramon Medeiros <ramonn@linux.vnet.ibm.com>