clear up name discrepancies