Additional fixes. (Resolving problem with equal class names)