Rename sprite but it doesn work too well anymore?
Revert "Rename sprite but it doesn work too well anymore?"

This reverts commit 2986139c912723199a0c91536734b65963212204.
Sprite State to be separated out again...