Changed block names
Merge branch 'master' of https://github.com/JamieRhys/comtechmod.git