Renaming Logic now works properly. Just need to make it look nice.