Fix: Some regression after renaming state and lastname.