Contact Type should give you a drop down for Government, Business, Individual, Non Profit and Profit and generate Organization Name field. Some of our Location Contacts are business and right now we have to split the name and Customer Type should add Business as an option as well and generate Organization Name field.