Added defines for custom command names