Renamed tables to reflec their types. Fixed bug with Excel Datasource import.