updated to support the NameResolver branch for the compiler