removed old keys, kept naming convention in there