Fixed names for custom modules