Renaming to comply with scientific naming conventions