Attempt to Fix Name Issues