Fixed name issues.