Set intrerface elements into the correct array

...and sightly rename one of them