Make consistent naming
Address Eric's comments