Use address names from addresses.h
Merge pull request #214 from adrian17/master

Use address names from addresses.h