improved some names