Fixed class_struct array naming