Fixes for renaming of package during initial commit