Fix missed occurrences of renaming masters to primaries

Issue #1992 (closed) dealt with renaming masters to primaries.

Ondrej noticed there are some leftover occurrences: !5234 (comment 223058)

Fix this occurrence and review if we missed others.