Updated composer with node type name changes