Samples renaming - because of name/namespace collisions