Rename & update to framework