Fix wrong resolution of class names in same namespace