Reorganise, rename methods between register modules