removed the "3" from table names, also used more consistent names.