Use underscores for word separation in keynames

    Introduces consistency in the format of key names
clear tab rot
Merge pull request #9 from anchor/unified_keys

Unified keys