Kingfisher

a362d7ec - Merge pull request #1459 from onevcat/fix/naming-improvement