Rename animation. more tweaks