Change keys to conform
Trying to Fix items