Changed some names to be more appropriate.