GH-2 Fixed component attr names