replace calls to Error to Errorf which was the original intention
Replace any '.' characters in key names with '_'