Better naming for SDK Modules