Merge "Signed config: some renames for clarity."