Inconsistent version tag of image streams

We use "1.0" tag in image stream tag fis-java-openshift:1.0, but in application-templates is default value "2.0". And another point of view is if we should rather use another naming for "fis-java-openshift" as it can collide with FIS 1.0 image streams (which have same name) and also if we upgrade in future to "2.0" it could collide also with FIS 2.0.