fixes for the renaming