fixed a few nameing issues