Fix wrong use of hard coded table names