fixed remaining occurrences of old names and wrong substitutions.