Clarify naming
Merge pull request #680 from SemanticMediaWiki/tidy

Clarify naming