Same patches as before except the keep case. From here forth I will keep the case in the id attributes and go back and update all the previous ones that were all lowercase.