Unified keys

Use only underscores for key separation. 

Merge into modified-impl-testable