Added key naming behavior