fixed a few more loose names