fixed names and references