Put naming scheme back for gson