Changed package names.

To make it consistent with the project name.