resolve conflicts while cherry-pick: rename plugin and table to handle long table names