make table names less collision prone
remove unused import