I know that a convert is called a ger tzedek. While a righteous non-Jew/goy is called a goy tzedek. From what I have found so far online, most just say/use "potential convert" when referring to someone who is on the path to conversion.
I did not think Ba'al Teshuva was appropriate but I can see it being argued.