Changed targets to match new test naming conventions.