SMP fixes and better mod naming