Fixed name issues