renamed some fields