Code refactored for KeyNameConversionStrategy.