Fix so that we can get name in form with '.' instead of '$' for non-qualified name.