Marc: fix/clarify spec names and comments