Fixed naming conflicts; speeded up JSON deserialization a little bit