This MR serves as a draft for converging on common naming schemes and handling of case.
Also see #113 (closed)