Keep name on some components