Fix some naming conventions aberrations. Add tests to ensure consistency between the two sets of symbols.
