Fix some misnamings
Update MAM plugin to follow 0.3 spec