Once more - adjust naming convention for thread-safe dictionary keys