Add ODI variables and make other renaming changes