Changed a few nameing conflicts and stuff