Fixes #9: Fix some improper handler names/usage.