Added naming conventions for kv's when prettified