This patch includes simple clean-ups to reduce unnecessary long variable names.
Signed-off-by: NJaegeuk Kim <jaegeuk.kim@samsung.com>