main: Fix some renaming leftovers

Change-Id: 976516d0db