Re-organize some strings

Change-Id: I6820791315770a53572e0587286560fb83a64d3b
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>