rename fields to match getter/setter