Actually fixed the renaming merge