Changed some Component Names and implementations