override and nested name fixes