Rename NonNullString to NonEmptyString and refactor