More name sustitutions