Fixed name errors