Guice and ospd5->sowpods naming cleanup.