Changed some names to use a naming convenion.