renamed components for consistency