Changed around some names for clarity