Changed package names (part 2)
This is in two parts being git was being annoying