small changes to deal with renaming, primitives