Fix cluster-spec to not break when cluster-name is a keyword

Two tiny fixes:
- first one ensures that cluster-spec allows cluster-name to be a keyword;
- second one fixes a typo in server-spec.

-David