Small fix on table/column names & mappings

Signed-off-by: Shabri Nur <shabri.nur.ilmi@gmail.com>