Working on armor. First step, fix the names, check!