Renamed some declarations to be more specific

Signed-off-by: Lilis Iskandar <veeableful@gmail.com>