Issue #9 - some function and variable name re-casing