Fix dependency issue
Change tablenames to match frontend