fix(security): Sort out the missing renames and moves that got lost in the rebase!