Fix some class naming and packaging issues, pending an MCP update
for the same