some names fixed