Company Names as Contacts for Leads etc.

Company Names as Contacts for Leads etc.

Everything I do is by company name as buyers and contacts change.  Before I get too along, can I re-import all of my leads to reflect this.
As an example, when I am looking at leads within the mobile map feature it shows the contact and not the company.  Should I just remap the Contact as the company name and the vice versa?

Thanks,
Tom