- Standardize naming in component