Reworked numerous specifications and source code skeleton to fix name prefixing inconsistencies.