More clean-up. Uniform naming conventions