Correct function naming convention

Please see the comments made at issue #9.