Modified Table Name

Modified table name to the current working table name.
Also, added TODO comment.