Renaming test shape classes for clarity.