Sorted the blocknames by type and added a few synonyms.