PLA-1590 name and type changes for static array