Rename import and go package back so pulling the upstream isn't as

Rename import and go package back so pulling the upstream isn't as #67