Issue #123 fix conventions