[DF-5476] fix uniform array naming
[DF-5476] small fix
[DF-5476] review fix
[DF-5476] review fix