I hope the patch becomes simpler in the future (cause no offense this seems like a lot for name changes)
