references and samples renaming