Fix table name and routes