refactored component name
refactored series name component
fix conflicts