truly minor modifications to names in components.py