Use consistent naming in elan suite