Addition code name fixes