Fixed runtime naming clash