No functional change. Use short index variables names in capitals, to ease... Closes L2SDP-601 See merge request desp/hdl!219