move from id to instancestype for all init methods
Merge branch 'id-to-instancetype' into develop