Making sure everything I have is actually committed because something
isn't working.
Changed names of a few packages to correct naming conventions