Fix message factory
Inner rename