Fixing additional issue with key naming