updated some names for clarity