fix naming clash