Change attributes back to the original names for backwards
compatibility.