Changed some more names for clarity
Changed some more names for clarity