do some renaming to make it easier to refer back to location objects later in code