Better selector name standardization