Standardize convention for class related data options, fixes #103