2014-07-14-11.23.00: More follow-up renaming of packages.