renamed all tables to match conventions so it is less confusing