Added components and some name changes.