change main cat and dev field name for consistency

and remove obsolete new_dev_id param in edit device