Renaming to comply with scientific conventions and to clean up the workflow