BAZYNGO-604 Some more renames.