Aligned with name and version changes