Use downwards-compatible notation for class variables. Closes #3