Fix property names to be JS friendly