Renamed some variables

Renamed variables, leaving none in the global scope, part of moving NOVA