Change key name to avoid conflicts