rename and preparation of type control