Replaced the @ sign with an _ for all key names