Updated names to be clearer.