BUGFIX: The special logic for picking instance components is not working in certain scenarios. Hardcoding those comp names for now