renamed "Type" to "Name" added shiptypes