You are quickly going out of the frying pan into the fire. Change every occurence of 0xExxxxxxx to 0x2xxxxxxx. Do not even think anything else. When you are done, build the package, check the situation, check again and submit.