Fixed Laser remapping (again) and added buildToolBlock name so that there are no more null names (That's the thing that the builder/filler uses to show the red flying breaker block)
Check style
Merge pull request #2070 from adudney/NameRemappingMark2

Fixed Laser remapping (again) and gave buildToolBlock a name