changed fields name to respect the type