Use better names for old and new states