Bah, half a day to Fix stupid names problem.
The names of block are now correct.