Cleanup naming, gradually remove all old references Component