Fixed default name changes