More fixes with names and references and such