Fixes invalid notation for polymorphic references
Renames some keys in fixtures