tightened up logic around adding of sizes / making model names consistent with xml