Renamed AddressNameKey to NameKey.
Merge branch 'master' of https://github.com/bryanedds/FPWorks