modify restart changes, so it stays backward compatible and does not result in...

modify restart changes, so it stays backward compatible and does not result in unexpected behavior when reading old restarts. also use consistent naming conventions for enum entries