Improved request component
Rename system components