More renaming - to make the stupid Arduino IDE happy.
Can't use "-" in sketch names. Changed to "_"