Some small changes to names and a little clean up.