simplified some names