1) Changing keys and names to generic