Fixed state issues, added friendly upgrade names