Remove Metro prefix from everything except MetroPlugin, add in CommandSender