fix table names
fix missing column
refactor to new plugin name