fixed names etc