Server: Changed the names of some fields to match naming conventions.