Address validation fix and class name change

Updated address validation to work with invalid addresses.

We've also updated class names.