Renaming applied to mapings
Scripts improved
Samples worked on