Workaround for the renaming process for the two internal targets. Still messy and a bit overkill...