cleanup and naming updates.