Started renaming to drop package suffix
TODO