diff --git a/tipbot/modules/payment.py b/tipbot/modules/payment.py
index 064b918..e116fff 100644
--- a/tipbot/modules/payment.py
+++ b/tipbot/modules/payment.py
@@ -89,5 +89,5 @@ def UpdateCoin(param):
     log_error('UpdateCoin: Failed to get bulk payments: %s' % str(e))
   last_wallet_update_time = time.time()
 
-RegisterIdleFunction("payment",UpdateCoin)
+RegisterIdleFunction(__name__,UpdateCoin)
 
diff --git a/tipbot/modules/tipping.py b/tipbot/modules/tipping.py
index 958afbb..4b56534 100644
--- a/tipbot/modules/tipping.py
+++ b/tipbot/modules/tipping.py
@@ -243,7 +243,7 @@ def RainActive(nick,chan,cmd):
 
 
 RegisterCommand({
-  'module': 'tipping',
+  'module': __name__,
   'name': 'tip',
   'parms': '<nick> <amount>',
   'function': Tip,
@@ -251,7 +251,7 @@ RegisterCommand({
   'help': "tip another user"
 })
 RegisterCommand({
-  'module': 'tipping',
+  'module': __name__,
   'name': 'rain',
   'parms': '<amount> [<users>]',
   'function': Rain,
@@ -259,7 +259,7 @@ RegisterCommand({
   'help': "rain some coins on everyone (or just a few)"
 })
 RegisterCommand({
-  'module': 'tipping',
+  'module': __name__,
   'name': 'rainactive',
   'parms': '<amount> [<hours>]',
   'function': RainActive,
diff --git a/tipbot/modules/withdraw.py b/tipbot/modules/withdraw.py
index b243fe8..eb0187d 100644
--- a/tipbot/modules/withdraw.py
+++ b/tipbot/modules/withdraw.py
@@ -147,7 +147,7 @@ def Withdraw(nick,chan,cmd):
 
 
 RegisterCommand({
-  'module': 'withdraw',
+  'module': __name__,
   'name': 'withdraw',
   'parms': '<address> [<amount>]',
   'function': Withdraw,
@@ -155,14 +155,14 @@ RegisterCommand({
   'help': "withdraw part or all of your balance"
 })
 RegisterCommand({
-  'module': 'withdraw',
+  'module': __name__,
   'name': 'enable_withdraw',
   'function': EnableWithdraw,
   'admin': True,
   'help': "Enable withdrawals"
 })
 RegisterCommand({
-  'module': 'withdraw',
+  'module': __name__,
   'name': 'disable_withdraw',
   'function': DisableWithdraw,
   'admin': True,