Updated postgres table name, column names