actual renaming; tests clean up
refactoring Scratch to be only constructed from full name with mnemonics