Issue #2 Class naming conventions