Adjust incorrect namespace
Rename existing samples before adding new samples