Conflicts

Fixed name models and update migrate controller + js/publisher