Cleaning up test assets to use a consistent naming scheme.