Mapping issues following upgrade

Elastic Stack Elasticsearch
1

Hi,

I am currently upgrading from elasticsearch 1.1.0 with couchbase 2.5 to ES 2.1.1 and couchbase 4, with the latest transport plugin. This is so that I can use Kibana 4.3, I've got everything setup but am having major issues with the mappings for elastic search.

I've been reading the following, however I just wanted some advice.
https://www.elastic.co/guide/en/elasticsearch/reference/current/breaking_20_mapping_changes.html#migration-meta-fields

It seems no like you can't have any types with the same name as a property, and properties can't have the same name as properties of another type, is this correct?

So currently I have a type "image"

					"image" : {
						"type" : "string",
						"index" : "no",
						"store" : false
					},

Then in several types I have properties that contain "image"

					"region" : {
						"properties" : {
							"aggregation" : {
								"type" : "string",
								"index" : "not_analyzed",
								"store" : false
							},
							"code" : {
								"type" : "string",
								"index" : "not_analyzed",
								"store" : false
							},
							"image" : {
								"type" : "string",
								"index" : "no",
								"store" : false
							},
							"title" : {
								"type" : "string",
								"index" : "analyzed",
								"store" : false
							}
						}
					},

Then there are other properties like title, aggregation, etc that are present in many types.

Any help would be much appreciated.

Andy