Corrects Names and Adds FallBack