Got rid of all the "Impl" suffixes again.

Trying to rule this out as an issue for test failure in travis.  If this passes there then the problem has been narrowed down to how sugar was loaded and use of gmaven over gmavenplus.