some components renamed