changed some names to make things more identifiable