Cosmetic improvements to specs
[Refactor] Namespace and cosmetic changes