Fix key name to store uuid