Separate class and function names. Relates to #93.
Maintenance, Archer integration.