Target correct java version
Add missing annotations
Update names for mcp903